From 606c63960a4845af7077721eb3900c706f5d0c5e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 2 Aug 2019 14:05:47 -0700 Subject: [PATCH 001/667] Restrict channel aliases to 19.03 This will remove the "test" and "stable" aliases for whatever major release comes after 19.03 (so once the next release comes out, "stable" will become a stale alias). I'm not 100% sure this is the right answer, but the "stable" alias has definitely been a huge source of confusion very recently (and it doesn't have much meaning anymore anyways given the death of the "edge" channel). --- generate-stackbrew-library.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index dde99337c..6b18cf4e8 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -122,12 +122,12 @@ for version in "${versions[@]}"; do ${aliases[$version]:-} ) if [ -z "${latestChannelRelease[$channel]:-}" ]; then - versionAliases+=( "$channel" ) + if [ "$rcVersion" = '19.03' ]; then versionAliases+=( "$channel" ); fi # 19.03 is the last release to include any "channel" aliases latestChannelRelease[$channel]="$version" fi # every release goes into the "test" channel, so the biggest numbered release wins (RC or not) if [ -z "${latestChannelRelease['test']:-}" ]; then - versionAliases+=( 'test' ) + if [ "$rcVersion" = '19.03' ]; then versionAliases+=( 'test' ); fi # 19.03 is the last release to include any "channel" aliases latestChannelRelease['test']="$version" fi if [ "$version" = "$rcVersion" ] && [ -z "${latestChannelRelease['latest']:-}" ]; then From 66fafcf390a5600ce137c5a5d5f03268016d8ffc Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 28 Apr 2020 14:46:00 -0700 Subject: [PATCH 002/667] Add initial GitHub Actions CI --- .github/workflows/ci.yml | 48 ++++++++++++++++++++++++++++++++++++++++ .travis.yml | 27 ---------------------- README.md | 9 ++++---- update.sh | 21 ------------------ 4 files changed, 52 insertions(+), 53 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..155ef3165 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,48 @@ +name: GitHub CI + +on: + pull_request: + push: + schedule: + - cron: 0 0 * * 0 + +defaults: + run: + shell: 'bash -Eeuo pipefail -x {0}' + +jobs: + + generate-jobs: + name: Generate Jobs + runs-on: ubuntu-latest + outputs: + strategy: ${{ steps.generate-jobs.outputs.strategy }} + steps: + - uses: actions/checkout@v1 + - id: generate-jobs + name: Generate Jobs + run: | + git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew + strategy="$(~/bashbrew/scripts/github-actions/generate.sh)" + jq . <<<"$strategy" # sanity check / debugging aid + echo "::set-output name=strategy::$strategy" + + test: + needs: generate-jobs + strategy: ${{ fromJson(needs.generate-jobs.outputs.strategy) }} + name: ${{ matrix.name }} + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v1 + - name: Prepare Environment + run: ${{ matrix.runs.prepare }} + - name: Pull Dependencies + run: ${{ matrix.runs.pull }} + - name: Build ${{ matrix.name }} + run: ${{ matrix.runs.build }} + - name: History ${{ matrix.name }} + run: ${{ matrix.runs.history }} + - name: Test ${{ matrix.name }} + run: ${{ matrix.runs.test }} + - name: '"docker images"' + run: ${{ matrix.runs.images }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2d835907a..000000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: bash -services: docker - -env: - - VERSION=19.03-rc - - VERSION=19.03 - -install: - - git clone https://github.com/docker-library/official-images.git ~/official-images - -before_script: - - env | sort - - cd "$VERSION" - - image="docker:$VERSION" - -script: - - travis_retry docker build -t "$image" . - - ~/official-images/test/run.sh "$image" - - travis_retry docker build -t "$image-dind" dind - - ~/official-images/test/run.sh "$image-dind" - - travis_retry docker build -t "$image-git" git - - ~/official-images/test/run.sh "$image-git" - -after_script: - - docker images - -# vim:set et ts=2 sw=2: diff --git a/README.md b/README.md index bfd2d4ab4..32bf88efe 100644 --- a/README.md +++ b/README.md @@ -14,13 +14,12 @@ For outstanding `docker` image PRs, check [PRs with the "library/docker" label o --- -- [![build status badge](https://img.shields.io/travis/docker-library/docker/master.svg?label=Travis%20CI)](https://travis-ci.org/docker-library/docker/branches) -- [![build status badge](https://img.shields.io/appveyor/ci/docker-library/docker/master.svg?label=AppVeyor)](https://ci.appveyor.com/project/docker-library/docker) -- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/docker.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/docker) +- [![build status badge](https://img.shields.io/github/workflow/status/docker-library/docker/GitHub%20CI/master?label=GitHub%20CI)](https://github.com/docker-library/docker/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amaster) +- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/docker.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/docker/) | Build | Status | Badges | (per-arch) | |:-:|:-:|:-:|:-:| -| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker) | -| [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/docker.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/docker) | +| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker/) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker/) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker/) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker/) | +| [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/docker.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/docker/) | diff --git a/update.sh b/update.sh index 756d6bc43..a63ed8802 100755 --- a/update.sh +++ b/update.sh @@ -63,8 +63,6 @@ dockerVersions="$( ' )" -travisEnv= -appveyorEnv= for version in "${versions[@]}"; do rcVersion="${version%-rc}" @@ -136,27 +134,8 @@ for version in "${versions[@]}"; do if [ "$majorVersion" -lt 18 ] || { [ "$majorVersion" -eq 18 ] && [ "$minorVersion" -lt 2 ]; }; then sed -ri '/pigz/d' "$df" fi - - if [[ "$variant" == windows/* ]]; then - winVariant="$(basename "$variant")" - - case "$winVariant" in - *-1709) ;; # no AppVeyor support for 1709 yet: https://github.com/appveyor/ci/issues/1885 - *) appveyorEnv='\n - version: '"$version"'\n variant: '"$winVariant$appveyorEnv" ;; - esac - fi done cp -a docker-entrypoint.sh modprobe.sh "$version/" cp -a dockerd-entrypoint.sh "$version/dind/" - - travisEnv='\n - VERSION='"$version$travisEnv" done - -travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)" -echo "$travis" > .travis.yml - -if [ -f .appveyor.yml ]; then - appveyor="$(awk -v 'RS=\n\n' '$1 == "environment:" { $0 = "environment:\n matrix:'"$appveyorEnv"'" } { printf "%s%s", $0, RS }' .appveyor.yml)" - echo "$appveyor" > .appveyor.yml -fi From a73d96e731e2dd5d6822c99a9af4dcbfbbedb2be Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Tue, 28 Apr 2020 03:00:19 +1000 Subject: [PATCH 003/667] Remove --userland-proxy-path (no longer necessary) --- 19.03-rc/dind/dockerd-entrypoint.sh | 2 +- 19.03/dind/dockerd-entrypoint.sh | 2 +- dockerd-entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/19.03-rc/dind/dockerd-entrypoint.sh b/19.03-rc/dind/dockerd-entrypoint.sh index 42aab58a8..d5f59fa9e 100755 --- a/19.03-rc/dind/dockerd-entrypoint.sh +++ b/19.03-rc/dind/dockerd-entrypoint.sh @@ -173,7 +173,7 @@ if [ "$1" = 'dockerd' ]; then --copy-up=/etc \ --copy-up=/run \ ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" --userland-proxy-path=rootlesskit-docker-proxy + "$@" elif [ -x '/usr/local/bin/dind' ]; then # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it set -- '/usr/local/bin/dind' "$@" diff --git a/19.03/dind/dockerd-entrypoint.sh b/19.03/dind/dockerd-entrypoint.sh index 42aab58a8..d5f59fa9e 100755 --- a/19.03/dind/dockerd-entrypoint.sh +++ b/19.03/dind/dockerd-entrypoint.sh @@ -173,7 +173,7 @@ if [ "$1" = 'dockerd' ]; then --copy-up=/etc \ --copy-up=/run \ ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" --userland-proxy-path=rootlesskit-docker-proxy + "$@" elif [ -x '/usr/local/bin/dind' ]; then # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it set -- '/usr/local/bin/dind' "$@" diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 42aab58a8..d5f59fa9e 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -173,7 +173,7 @@ if [ "$1" = 'dockerd' ]; then --copy-up=/etc \ --copy-up=/run \ ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" --userland-proxy-path=rootlesskit-docker-proxy + "$@" elif [ -x '/usr/local/bin/dind' ]; then # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it set -- '/usr/local/bin/dind' "$@" From cdd23554f9417055ca2a18805fa9ad5716209934 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 19 May 2020 23:04:14 +0000 Subject: [PATCH 004/667] Update to 19.03.9 --- 19.03/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/19.03/Dockerfile b/19.03/Dockerfile index 007d88896..96a4a2034 100644 --- a/19.03/Dockerfile +++ b/19.03/Dockerfile @@ -12,7 +12,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 19.03.8 +ENV DOCKER_VERSION 19.03.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) From 23814eff7f7e45a8fb5898740cabf24e377c64c4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 29 May 2020 05:04:11 +0000 Subject: [PATCH 005/667] Update to 19.03.10 --- 19.03/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/19.03/Dockerfile b/19.03/Dockerfile index 96a4a2034..d69956017 100644 --- a/19.03/Dockerfile +++ b/19.03/Dockerfile @@ -12,7 +12,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 19.03.9 +ENV DOCKER_VERSION 19.03.10 # 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) From 1e1315f53a45ee2563afb97880feadfad2eb3059 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 1 Jun 2020 15:24:53 +0000 Subject: [PATCH 006/667] Update to 19.03.11 --- 19.03/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/19.03/Dockerfile b/19.03/Dockerfile index d69956017..b34031fa6 100644 --- a/19.03/Dockerfile +++ b/19.03/Dockerfile @@ -12,7 +12,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 19.03.10 +ENV DOCKER_VERSION 19.03.11 # 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) From eb305f71421bf772cfac2a46571280ff90f60033 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 1 Jun 2020 14:30:11 -0700 Subject: [PATCH 007/667] Update to Alpine 3.12 --- 19.03-rc/Dockerfile | 2 +- 19.03/Dockerfile | 2 +- update.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/19.03-rc/Dockerfile b/19.03-rc/Dockerfile index 889eb99e5..b674d35af 100644 --- a/19.03-rc/Dockerfile +++ b/19.03-rc/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.12 RUN apk add --no-cache \ ca-certificates \ diff --git a/19.03/Dockerfile b/19.03/Dockerfile index b34031fa6..49644e890 100644 --- a/19.03/Dockerfile +++ b/19.03/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.12 RUN apk add --no-cache \ ca-certificates \ diff --git a/update.sh b/update.sh index a63ed8802..1b339f4d0 100755 --- a/update.sh +++ b/update.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eo pipefail -defaultAlpineVersion='3.11' +defaultAlpineVersion='3.12' declare -A alpineVersion=( #[17.09]='3.6' ) From 86f7f4b563c7c6fe4620c5a8d82694a78f41989f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Jun 2020 16:18:33 +0000 Subject: [PATCH 008/667] Update to 19.03.12 --- 19.03/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/19.03/Dockerfile b/19.03/Dockerfile index 49644e890..e5873be2b 100644 --- a/19.03/Dockerfile +++ b/19.03/Dockerfile @@ -12,7 +12,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 19.03.11 +ENV DOCKER_VERSION 19.03.12 # 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) From 93c19dff54de9876f736b3aa8026be5ad5987388 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Jul 2020 17:04:11 +0000 Subject: [PATCH 009/667] Update to 19.03.12 --- 19.03/dind/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/19.03/dind/Dockerfile b/19.03/dind/Dockerfile index eec9871d5..37bcfa70f 100644 --- a/19.03/dind/Dockerfile +++ b/19.03/dind/Dockerfile @@ -31,7 +31,7 @@ RUN set -x \ && echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 37498f009d8bf25fbb6199e8ccd34bed84f2874b +ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ From 399f205733e0162fe6f6529fad8f2231b843606e Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 28 Jul 2020 16:52:42 +0900 Subject: [PATCH 010/667] bump up rootlesskit to v0.10.0 Fix port forwarder resource leak (https://github.com/rootless-containers/rootlesskit/issues/153). Other changes: https://github.com/rootless-containers/rootlesskit/releases Signed-off-by: Akihiro Suda --- 19.03-rc/dind-rootless/Dockerfile | 2 +- 19.03/dind-rootless/Dockerfile | 2 +- Dockerfile-dind-rootless.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/19.03-rc/dind-rootless/Dockerfile b/19.03-rc/dind-rootless/Dockerfile index 47984bd58..7b974d084 100644 --- a/19.03-rc/dind-rootless/Dockerfile +++ b/19.03-rc/dind-rootless/Dockerfile @@ -47,7 +47,7 @@ RUN set -eux; \ vpnkit --version # https://github.com/rootless-containers/rootlesskit/releases -ENV ROOTLESSKIT_VERSION 0.9.1 +ENV ROOTLESSKIT_VERSION 0.10.0 RUN set -eux; \ apk add --no-cache --virtual .rootlesskit-build-deps \ diff --git a/19.03/dind-rootless/Dockerfile b/19.03/dind-rootless/Dockerfile index e77bcd670..e9f8cfcd9 100644 --- a/19.03/dind-rootless/Dockerfile +++ b/19.03/dind-rootless/Dockerfile @@ -47,7 +47,7 @@ RUN set -eux; \ vpnkit --version # https://github.com/rootless-containers/rootlesskit/releases -ENV ROOTLESSKIT_VERSION 0.9.1 +ENV ROOTLESSKIT_VERSION 0.10.0 RUN set -eux; \ apk add --no-cache --virtual .rootlesskit-build-deps \ diff --git a/Dockerfile-dind-rootless.template b/Dockerfile-dind-rootless.template index 6f30d8215..5d596cf02 100644 --- a/Dockerfile-dind-rootless.template +++ b/Dockerfile-dind-rootless.template @@ -36,7 +36,7 @@ RUN set -eux; \ vpnkit --version # https://github.com/rootless-containers/rootlesskit/releases -ENV ROOTLESSKIT_VERSION 0.9.1 +ENV ROOTLESSKIT_VERSION 0.10.0 RUN set -eux; \ apk add --no-cache --virtual .rootlesskit-build-deps \ From 4f5b0cb5438527c6913a943ae07b4d2b1eaa8393 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 31 Jul 2020 11:04:12 +0000 Subject: [PATCH 011/667] Update to 19.03.13-beta1 --- 19.03-rc/Dockerfile | 2 +- 19.03-rc/dind/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/19.03-rc/Dockerfile b/19.03-rc/Dockerfile index b674d35af..42804f6a1 100644 --- a/19.03-rc/Dockerfile +++ b/19.03-rc/Dockerfile @@ -12,7 +12,7 @@ RUN apk add --no-cache \ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf ENV DOCKER_CHANNEL test -ENV DOCKER_VERSION 19.03.6-rc2 +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/19.03-rc/dind/Dockerfile b/19.03-rc/dind/Dockerfile index 768f8c925..563c07da6 100644 --- a/19.03-rc/dind/Dockerfile +++ b/19.03-rc/dind/Dockerfile @@ -31,7 +31,7 @@ RUN set -x \ && echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 37498f009d8bf25fbb6199e8ccd34bed84f2874b +ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ From 184d0e7687beb67e227d1ce2e0ab79a357613566 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 4 Aug 2020 11:04:13 +0000 Subject: [PATCH 012/667] Update to 19.03.13-beta2 --- 19.03-rc/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/19.03-rc/Dockerfile b/19.03-rc/Dockerfile index 42804f6a1..cd2d3fdaa 100644 --- a/19.03-rc/Dockerfile +++ b/19.03-rc/Dockerfile @@ -12,7 +12,7 @@ RUN apk add --no-cache \ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf ENV DOCKER_CHANNEL test -ENV DOCKER_VERSION 19.03.13-beta1 +ENV DOCKER_VERSION 19.03.13-beta2 # 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) From 66c83a536259775694aa5d316426f3ff3ddcda6e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 17 Sep 2020 20:11:37 +0000 Subject: [PATCH 013/667] Update to 19.03.13 --- 19.03/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/19.03/Dockerfile b/19.03/Dockerfile index e5873be2b..222ad589d 100644 --- a/19.03/Dockerfile +++ b/19.03/Dockerfile @@ -12,7 +12,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 19.03.12 +ENV DOCKER_VERSION 19.03.13 # 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) From 12d1c2763b54d29137ec448a3e4ad1a9aefae1a0 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 9 Oct 2020 16:32:12 -0700 Subject: [PATCH 014/667] Add initial jq-based templating engine --- .architectures-lib | 53 --------- .github/workflows/verify-templating.yml | 22 ++++ .gitignore | 1 + 19.03-rc/Dockerfile | 35 +++--- 19.03-rc/dind-rootless/Dockerfile | 25 ++-- 19.03-rc/dind/Dockerfile | 6 + 19.03-rc/git/Dockerfile | 6 + 19.03/Dockerfile | 35 +++--- 19.03/dind-rootless/Dockerfile | 25 ++-- 19.03/dind/Dockerfile | 6 + 19.03/git/Dockerfile | 6 + Dockerfile-dind-rootless.template | 37 ++++-- Dockerfile-dind.template | 4 +- Dockerfile-git.template | 2 +- Dockerfile.template | 40 +++++-- apply-templates.sh | 47 ++++++++ generate-stackbrew-library.sh | 150 +++++++++++------------- release-architectures | 9 -- update.sh | 138 +--------------------- versions.json | 54 +++++++++ versions.sh | 145 +++++++++++++++++++++++ 21 files changed, 489 insertions(+), 357 deletions(-) delete mode 100644 .architectures-lib create mode 100644 .github/workflows/verify-templating.yml create mode 100644 .gitignore create mode 100755 apply-templates.sh delete mode 100644 release-architectures create mode 100644 versions.json create mode 100755 versions.sh diff --git a/.architectures-lib b/.architectures-lib deleted file mode 100644 index 88e72f8bb..000000000 --- a/.architectures-lib +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env bash - -_awkArch() { - local awkExpr="$1"; shift - awk "$@" "/^#|^\$/ { next } $awkExpr" release-architectures -} - -hasBashbrewArch() { - local bashbrewArch="$1"; shift - _awkArch 'BEGIN { exitCode = 1 } $1 == bashbrewArch { exitCode = 0 } END { exit exitCode }' -v bashbrewArch="$bashbrewArch" -} - -apkArches() { - _awkArch '{ print $2 }' -} - -apkToDockerArch() { - local apkArch="$1"; shift - _awkArch '$2 == apkArch { print $3; exit }' -v apkArch="$apkArch" -} - -apkToBashbrewArch() { - local apkArch="$1"; shift - _awkArch '$2 == apkArch { print $1; exit }' -v apkArch="$apkArch" -} - -_generateParentRepoToArches() { - local repo="$1"; shift - local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/' - - eval "declare -g -A parentRepoToArches=( $( - find -name 'Dockerfile' -exec awk ' - toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|.*\/.*)(:|$)/ { - print "'"$officialImagesUrl"'" $2 - } - ' '{}' + \ - | sort -u \ - | xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"' - ) )" -} -_generateParentRepoToArches 'docker' - -versionChannel() { - local version="$1"; shift # "17.06", "17.11-rc", etc - local rcVersion="${version%-rc}" - - local channel='stable' - if [ "$rcVersion" != "$version" ]; then - channel='test' - fi - - echo "$channel" -} diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml new file mode 100644 index 000000000..7e833f1c7 --- /dev/null +++ b/.github/workflows/verify-templating.yml @@ -0,0 +1,22 @@ +name: Verify Templating + +on: + pull_request: + push: + +defaults: + run: + shell: 'bash -Eeuo pipefail -x {0}' + +jobs: + apply-templates: + name: Check For Uncomitted Changes + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Apply Templates + run: ./apply-templates.sh + - name: Check Git Status + run: | + status="$(git status --short)" + [ -z "$status" ] diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..d548f66de --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.jq-template.awk diff --git a/19.03-rc/Dockerfile b/19.03-rc/Dockerfile index cd2d3fdaa..0d34e9289 100644 --- a/19.03-rc/Dockerfile +++ b/19.03-rc/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.12 RUN apk add --no-cache \ @@ -11,7 +17,6 @@ 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 test ENV DOCKER_VERSION 19.03.13-beta2 # TODO ENV DOCKER_SHA256 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !! @@ -19,24 +24,24 @@ ENV DOCKER_VERSION 19.03.13-beta2 RUN set -eux; \ \ -# this "case" statement is generated via "update.sh" apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ -# amd64 - x86_64) dockerArch='x86_64' ;; \ -# arm32v6 - armhf) dockerArch='armel' ;; \ -# arm32v7 - armv7) dockerArch='armhf' ;; \ -# arm64v8 - aarch64) dockerArch='aarch64' ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-19.03.13-beta2.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-19.03.13-beta2.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-19.03.13-beta2.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-19.03.13-beta2.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ \ - if ! wget -O docker.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${dockerArch}/docker-${DOCKER_VERSION}.tgz"; then \ - echo >&2 "error: failed to download 'docker-${DOCKER_VERSION}' from '${DOCKER_CHANNEL}' for '${dockerArch}'"; \ - exit 1; \ - fi; \ + wget -O docker.tgz "$url"; \ \ tar --extract \ --file docker.tgz \ diff --git a/19.03-rc/dind-rootless/Dockerfile b/19.03-rc/dind-rootless/Dockerfile index 7b974d084..352dcddd8 100644 --- a/19.03-rc/dind-rootless/Dockerfile +++ b/19.03-rc/dind-rootless/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM docker:19.03-rc-dind # busybox "ip" is insufficient: @@ -15,24 +21,15 @@ RUN set -eux; \ RUN set -eux; \ \ -# this "case" statement is generated via "update.sh" apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ -# amd64 - x86_64) dockerArch='x86_64' ;; \ -# arm32v6 - armhf) dockerArch='armel' ;; \ -# arm32v7 - armv7) dockerArch='armhf' ;; \ -# arm64v8 - aarch64) dockerArch='aarch64' ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-19.03.13-beta2.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ \ - if ! wget -O rootless.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${dockerArch}/docker-rootless-extras-${DOCKER_VERSION}.tgz"; then \ - echo >&2 "error: failed to download 'docker-rootless-extras-${DOCKER_VERSION}' from '${DOCKER_CHANNEL}' for '${dockerArch}'"; \ - exit 1; \ - fi; \ + wget -O rootless.tgz "$url"; \ \ tar --extract \ --file rootless.tgz \ diff --git a/19.03-rc/dind/Dockerfile b/19.03-rc/dind/Dockerfile index 563c07da6..b6c98a168 100644 --- a/19.03-rc/dind/Dockerfile +++ b/19.03-rc/dind/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM docker:19.03-rc # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies diff --git a/19.03-rc/git/Dockerfile b/19.03-rc/git/Dockerfile index 88183ef05..650367c63 100644 --- a/19.03-rc/git/Dockerfile +++ b/19.03-rc/git/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM docker:19.03-rc RUN apk add --no-cache git diff --git a/19.03/Dockerfile b/19.03/Dockerfile index 222ad589d..395b13a33 100644 --- a/19.03/Dockerfile +++ b/19.03/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM alpine:3.12 RUN apk add --no-cache \ @@ -11,7 +17,6 @@ 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.13 # TODO ENV DOCKER_SHA256 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !! @@ -19,24 +24,24 @@ ENV DOCKER_VERSION 19.03.13 RUN set -eux; \ \ -# this "case" statement is generated via "update.sh" apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ -# amd64 - x86_64) dockerArch='x86_64' ;; \ -# arm32v6 - armhf) dockerArch='armel' ;; \ -# arm32v7 - armv7) dockerArch='armhf' ;; \ -# arm64v8 - aarch64) dockerArch='aarch64' ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-19.03.13.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-19.03.13.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ \ - if ! wget -O docker.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${dockerArch}/docker-${DOCKER_VERSION}.tgz"; then \ - echo >&2 "error: failed to download 'docker-${DOCKER_VERSION}' from '${DOCKER_CHANNEL}' for '${dockerArch}'"; \ - exit 1; \ - fi; \ + wget -O docker.tgz "$url"; \ \ tar --extract \ --file docker.tgz \ diff --git a/19.03/dind-rootless/Dockerfile b/19.03/dind-rootless/Dockerfile index e9f8cfcd9..d0087314f 100644 --- a/19.03/dind-rootless/Dockerfile +++ b/19.03/dind-rootless/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM docker:19.03-dind # busybox "ip" is insufficient: @@ -15,24 +21,15 @@ RUN set -eux; \ RUN set -eux; \ \ -# this "case" statement is generated via "update.sh" apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ -# amd64 - x86_64) dockerArch='x86_64' ;; \ -# arm32v6 - armhf) dockerArch='armel' ;; \ -# arm32v7 - armv7) dockerArch='armhf' ;; \ -# arm64v8 - aarch64) dockerArch='aarch64' ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.13.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ \ - if ! wget -O rootless.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${dockerArch}/docker-rootless-extras-${DOCKER_VERSION}.tgz"; then \ - echo >&2 "error: failed to download 'docker-rootless-extras-${DOCKER_VERSION}' from '${DOCKER_CHANNEL}' for '${dockerArch}'"; \ - exit 1; \ - fi; \ + wget -O rootless.tgz "$url"; \ \ tar --extract \ --file rootless.tgz \ diff --git a/19.03/dind/Dockerfile b/19.03/dind/Dockerfile index 37bcfa70f..aa10b267b 100644 --- a/19.03/dind/Dockerfile +++ b/19.03/dind/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM docker:19.03 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies diff --git a/19.03/git/Dockerfile b/19.03/git/Dockerfile index 2c8edb9f8..5fa563b1e 100644 --- a/19.03/git/Dockerfile +++ b/19.03/git/Dockerfile @@ -1,3 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + FROM docker:19.03 RUN apk add --no-cache git diff --git a/Dockerfile-dind-rootless.template b/Dockerfile-dind-rootless.template index 5d596cf02..043d192e0 100644 --- a/Dockerfile-dind-rootless.template +++ b/Dockerfile-dind-rootless.template @@ -1,4 +1,4 @@ -FROM docker:%%VERSION%%-dind +FROM docker:{{ env.version }}-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 @@ -15,13 +15,36 @@ RUN set -eux; \ RUN set -eux; \ \ -# this "case" statement is generated via "update.sh" - %%ARCH-CASE%%; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ +{{ + [ + .arches | to_entries[] + | select(.value.rootlessExtrasUrl) + | .key as $bashbrewArch + | ( + { + amd64: "x86_64", + arm32v6: "armhf", + arm32v7: "armv7", + arm64v8: "aarch64", + } + | .[$bashbrewArch] // $bashbrewArch + ) as $apkArch + | .value + | ( +-}} + {{ $apkArch | @sh }}) \ + url={{ .rootlessExtrasUrl | @sh }}; \ + ;; \ +{{ + ) + ] | add +-}} + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + esac; \ \ - if ! wget -O rootless.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${dockerArch}/docker-rootless-extras-${DOCKER_VERSION}.tgz"; then \ - echo >&2 "error: failed to download 'docker-rootless-extras-${DOCKER_VERSION}' from '${DOCKER_CHANNEL}' for '${dockerArch}'"; \ - exit 1; \ - fi; \ + wget -O rootless.tgz "$url"; \ \ tar --extract \ --file rootless.tgz \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 04f2d31bc..d0a234da0 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -1,4 +1,4 @@ -FROM docker:%%VERSION%% +FROM docker:{{ env.version }} # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies RUN set -eux; \ @@ -31,7 +31,7 @@ RUN set -x \ && echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT %%DIND-COMMIT%% +ENV DIND_COMMIT {{ .dindCommit }} RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/Dockerfile-git.template b/Dockerfile-git.template index 1c5647123..0bf1a1ce4 100644 --- a/Dockerfile-git.template +++ b/Dockerfile-git.template @@ -1,3 +1,3 @@ -FROM docker:%%VERSION%% +FROM docker:{{ env.version }} RUN apk add --no-cache git diff --git a/Dockerfile.template b/Dockerfile.template index 002a4c708..a51f771a5 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -1,4 +1,4 @@ -FROM alpine:%%TAG%% +FROM alpine:{{ .alpine }} RUN apk add --no-cache \ ca-certificates \ @@ -11,21 +11,43 @@ 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 %%DOCKER-CHANNEL%% -ENV DOCKER_VERSION %%DOCKER-VERSION%% +ENV DOCKER_VERSION {{ .version }} # 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) RUN set -eux; \ \ -# this "case" statement is generated via "update.sh" - %%ARCH-CASE%%; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ +{{ + [ + .arches | to_entries[] + | select(.value.dockerUrl) + | .key as $bashbrewArch + | ( + { + amd64: "x86_64", + arm32v6: "armhf", + arm32v7: "armv7", + arm64v8: "aarch64", + } + | .[$bashbrewArch] // $bashbrewArch + ) as $apkArch + | .value + | ( +-}} + {{ $apkArch | @sh }}) \ + url={{ .dockerUrl | @sh }}; \ + ;; \ +{{ + ) + ] | add +-}} + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + esac; \ \ - if ! wget -O docker.tgz "https://download.docker.com/linux/static/${DOCKER_CHANNEL}/${dockerArch}/docker-${DOCKER_VERSION}.tgz"; then \ - echo >&2 "error: failed to download 'docker-${DOCKER_VERSION}' from '${DOCKER_CHANNEL}' for '${dockerArch}'"; \ - exit 1; \ - fi; \ + wget -O docker.tgz "$url"; \ \ tar --extract \ --file docker.tgz \ diff --git a/apply-templates.sh b/apply-templates.sh new file mode 100755 index 000000000..65a4cbbf9 --- /dev/null +++ b/apply-templates.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +[ -f versions.json ] # run "versions.sh" first + +jqt='.jq-template.awk' +if [ -n "${BASHBREW_SCRIPTS:-}" ]; then + jqt="$BASHBREW_SCRIPTS/jq-template.awk" +elif [ "$BASH_SOURCE" -nt "$jqt" ]; then + wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/5f0c26381fb7cc78b2d217d58007800bdcfbcfa1/scripts/jq-template.awk' +fi + +if [ "$#" -eq 0 ]; then + versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)" + eval "set -- $versions" +fi + +generated_warning() { + cat <<-EOH + # + # NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" + # + # PLEASE DO NOT EDIT IT DIRECTLY. + # + + EOH +} + +for version; do + export version + + variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)" + eval "variants=( $variants )" + + for variant in "${variants[@]}"; do + template="Dockerfile${variant:+-$variant}.template" + target="$version${variant:+/$variant}/Dockerfile" + + { + generated_warning + gawk -f "$jqt" "$template" + } > "$target" + done + + cp -a docker-entrypoint.sh modprobe.sh "$version/" + cp -a dockerd-entrypoint.sh "$version/dind/" +done diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 6b18cf4e8..24f0a69b1 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,44 +1,13 @@ #!/bin/bash set -eu -declare -A aliases=( - #[18.06]='edge' -) - -# used for auto-detecting the "latest" of each channel (for tagging it appropriately) -# https://blog.docker.com/2017/03/docker-enterprise-edition/ -declare -A latestChannelRelease=() - self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" -source '.architectures-lib' - -parentArches() { - local version="$1"; shift # "17.06", etc - - local parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")" - echo "${parentRepoToArches[$parent]:-}" -} -versionArches() { - local version="$1"; shift - - local parentArches="$(parentArches "$version")" - - local versionArches=() - for arch in $parentArches; do - if hasBashbrewArch "$arch" && grep -qE "^# $arch\$" "$version/Dockerfile"; then - versionArches+=( "$arch" ) - fi - done - echo "${versionArches[*]}" -} - -versions=( */ ) -versions=( "${versions[@]%/}" ) - -# sort version numbers with highest first -IFS=$'\n'; versions=( $(echo "${versions[*]}" | sort -rV) ); unset IFS +if [ "$#" -eq 0 ]; then + versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)" + eval "set -- $versions" +fi # get the most recent commit which modified any of "$@" fileCommit() { @@ -62,6 +31,48 @@ dirCommit() { ) } +getArches() { + local repo="$1"; shift + local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/' + + eval "declare -A -g parentRepoToArches=( $( + find -name 'Dockerfile' -exec awk ' + toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|.*\/.*)(:|$)/ { + print "'"$officialImagesUrl"'" $2 + } + ' '{}' + \ + | sort -u \ + | xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"' + ) )" +} +getArches 'docker' + +versionArches() { + local version="$1"; shift + local variant="${1:-}" + local selector='dockerUrl' + if [[ "$variant" = *rootless ]]; then + selector='rootlessExtrasUrl' + fi + + local parent parentArches + parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")" + parentArches="${parentRepoToArches[$parent]:-}" + + comm -12 \ + <( + version="$version" jq -r ' + .[env.version].arches | to_entries[] + | select(.value.'"$selector"') + | .key + ' versions.json | sort + ) \ + <(xargs -n1 <<<"$parentArches" | sort) +} + +# sort version numbers with highest first +IFS=$'\n'; set -- $(sort -rV <<<"$*"); unset IFS + cat <<-EOH # this file is generated via https://github.com/docker-library/docker/blob/$(fileCommit "$self")/$self @@ -77,16 +88,20 @@ join() { echo "${out#$sep}" } -for version in "${versions[@]}"; do - rcVersion="${version%-rc}" +# used for auto-detecting the "latest" of each channel (for tagging it appropriately) +# https://blog.docker.com/2017/03/docker-enterprise-edition/ +declare -A latestChannelRelease=() - commit="$(dirCommit "$version")" +for version; do + export version + rcVersion="${version%-rc}" - fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "ENV" && $2 == "DOCKER_VERSION" { print $3; exit }')" + fullVersion="$(jq -r '.[env.version].version' versions.json)" if [ "$rcVersion" != "$version" ] && [ -e "$rcVersion/Dockerfile" ]; then # if this is a "-rc" release, let's make sure the release it contains isn't already GA (and thus something we should not publish anymore) - rcFullVersion="$(git show HEAD:"$rcVersion/Dockerfile" | awk '$1 == "ENV" && $2 == "DOCKER_VERSION" { print $3; exit }')" + export rcVersion + rcFullVersion="$(jq -r '.[env.rcVersion].version' versions.json)" latestVersion="$({ echo "$fullVersion"; echo "$rcFullVersion"; } | sort -V | tail -1)" if [[ "$fullVersion" == "$rcFullVersion"* ]] || [ "$latestVersion" = "$rcFullVersion" ]; then # "x.y.z-rc1" == x.y.z* @@ -108,7 +123,6 @@ for version in "${versions[@]}"; do ) # add a few channel/version-related aliases - channel="$(versionChannel "$version")" majorVersion="${version%%.*}" if [ "$version" != "$rcVersion" ] && [ -z "${latestChannelRelease['rc']:-}" ]; then versionAliases+=( 'rc' ) @@ -118,9 +132,11 @@ for version in "${versions[@]}"; do versionAliases+=( "$majorVersion" ) latestChannelRelease["$majorVersion"]="$version" fi - versionAliases+=( - ${aliases[$version]:-} - ) + + channel='stable' + if [ "$rcVersion" != "$version" ]; then + channel='test' + fi if [ -z "${latestChannelRelease[$channel]:-}" ]; then if [ "$rcVersion" = '19.03' ]; then versionAliases+=( "$channel" ); fi # 19.03 is the last release to include any "channel" aliases latestChannelRelease[$channel]="$version" @@ -135,54 +151,24 @@ for version in "${versions[@]}"; do latestChannelRelease['latest']="$version" fi - versionArches="$(versionArches "$version")" - - echo - cat <<-EOE - Tags: $(join ', ' "${versionAliases[@]}") - Architectures: $(join ', ' $versionArches) - GitCommit: $commit - Directory: $version - EOE - - for v in \ - dind dind-rootless git \ - windows/windowsservercore-{ltsc2016,1709} \ - ; do - dir="$version/$v" + variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)" + eval "variants=( $variants )" + + for variant in "${variants[@]}"; do + dir="$version${variant:+/$variant}" [ -f "$dir/Dockerfile" ] || continue - variant="$(basename "$v")" commit="$(dirCommit "$dir")" - variantAliases=( "${versionAliases[@]/%/-$variant}" ) + variantAliases=( "${versionAliases[@]/%/${variant:+-$variant}}" ) variantAliases=( "${variantAliases[@]//latest-/}" ) - case "$v" in - # https://github.com/docker/docker-ce/blob/8fb3bb7b2210789a4471c017561c1b0de0b4f145/components/engine/hack/make/binary-daemon#L24 - # "vpnkit is amd64-only" ... for now?? - dind-rootless) variantArches='amd64' ;; - - windows/*) variantArches='windows-amd64' ;; - *) variantArches="$versionArches" ;; - esac - - sharedTags=() - if [[ "$variant" == 'windowsservercore'* ]]; then - sharedTags=( "${versionAliases[@]/%/-windowsservercore}" ) - sharedTags=( "${sharedTags[@]//latest-/}" ) - fi - echo - echo "Tags: $(join ', ' "${variantAliases[@]}")" - if [ "${#sharedTags[@]}" -gt 0 ]; then - echo "SharedTags: $(join ', ' "${sharedTags[@]}")" - fi cat <<-EOE - Architectures: $(join ', ' $variantArches) + Tags: $(join ', ' "${variantAliases[@]}") + Architectures: $(join ', ' $(versionArches "$version" "$variant")) GitCommit: $commit Directory: $dir EOE - [ "$variant" = "$v" ] || echo "Constraints: $variant" done done diff --git a/release-architectures b/release-architectures deleted file mode 100644 index 1271c0eb9..000000000 --- a/release-architectures +++ /dev/null @@ -1,9 +0,0 @@ -# see subdirectories of https://download.docker.com/linux/static/ - -# bashbrew-arch apk-arch docker-release-arch -amd64 x86_64 x86_64 -arm32v6 armhf armel -arm32v7 armv7 armhf -arm64v8 aarch64 aarch64 -ppc64le ppc64le ppc64le -s390x s390x s390x diff --git a/update.sh b/update.sh index 1b339f4d0..f19a544c0 100755 --- a/update.sh +++ b/update.sh @@ -1,141 +1,7 @@ #!/bin/bash set -eo pipefail -defaultAlpineVersion='3.12' -declare -A alpineVersion=( - #[17.09]='3.6' -) - cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" -source '.architectures-lib' - -versions=( "$@" ) -if [ ${#versions[@]} -eq 0 ]; then - versions=( */ ) -fi -versions=( "${versions[@]%/}" ) - -# see http://stackoverflow.com/a/2705678/433558 -sed_escape_lhs() { - echo "$@" | sed -e 's/[]\/$*.^|[]/\\&/g' -} -sed_escape_rhs() { - echo "$@" | sed -e 's/[\/&]/\\&/g' | sed -e ':a;N;$!ba;s/\n/\\n/g' -} - -# "tac|tac" for http://stackoverflow.com/a/28879552/433558 -dindLatest="$(curl -fsSL 'https://github.com/docker/docker/commits/master/hack/dind.atom' | tac|tac | awk -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')" - -dockerVersions="$( - git ls-remote --tags https://github.com/docker/docker-ce.git \ - | cut -d$'\t' -f2 \ - | grep '^refs/tags/v[0-9].*$' \ - | sed 's!^refs/tags/v!!; s!\^{}$!!' \ - | sort -u \ - | gawk ' - { data[lines++] = $0 } - - # "beta" sorts lower than "tp" even though "beta" is a more preferred release, so we need to explicitly adjust the sorting order for RCs - # also, "18.09.0-ce-beta1" vs "18.09.0-beta3" - function docker_version_compare(i1, v1, i2, v2, l, r) { - l = v1; gsub(/-ce/, "", l); gsub(/-tp/, "-alpha", l) - r = v2; gsub(/-ce/, "", r); gsub(/-tp/, "-alpha", r) - patsplit(l, ltemp, /[^.-]+/) - patsplit(r, rtemp, /[^.-]+/) - for (i = 0; i < length(ltemp) && i < length(rtemp); ++i) { - if (ltemp[i] < rtemp[i]) { - return -1 - } - if (ltemp[i] > rtemp[i]) { - return 1 - } - } - return 0 - } - - END { - asort(data, result, "docker_version_compare") - for (i in result) { - print result[i] - } - } - ' -)" - -for version in "${versions[@]}"; do - rcVersion="${version%-rc}" - - versionOptions="$(grep "^$rcVersion[.]" <<<"$dockerVersions")" - - rcGrepV='-v' - if [ "$rcVersion" != "$version" ]; then - rcGrepV= - fi - - fullVersion="$(grep $rcGrepV -E -- '-(rc|tp|beta)' <<<"$versionOptions" | tail -1)" - if [ -z "$fullVersion" ]; then - echo >&2 "warning: cannot find full version for $version" - continue - fi - - channel="$(versionChannel "$version")" - - echo "$version: $fullVersion ($channel)" - - archCase='apkArch="$(apk --print-arch)"; '$'\\\n' - archCase+=$'\t''case "$apkArch" in '$'\\\n' - for apkArch in $(apkArches); do - dockerArch="$(apkToDockerArch "$apkArch")" - # check whether the given architecture is supported for this release - if wget --quiet --spider "https://download.docker.com/linux/static/$channel/$dockerArch/docker-$fullVersion.tgz" &> /dev/null; then - bashbrewArch="$(apkToBashbrewArch "$apkArch")" - archCase+="# $bashbrewArch"$'\n' - archCase+=$'\t\t'"$apkArch) dockerArch='$dockerArch' ;; "$'\\\n' - fi - done - archCase+=$'\t\t''*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;'$'\\\n' - archCase+=$'\t''esac' - - alpine="${alpineVersion[$version]:-$defaultAlpineVersion}" - - majorVersion="${fullVersion%%.*}" - minorVersion="${fullVersion#$majorVersion.}" - minorVersion="${minorVersion%%.*}" - minorVersion="${minorVersion#0}" - - for variant in \ - '' git dind dind-rootless \ - windows/windowsservercore-{1709,ltsc2016} \ - ; do - dir="$version${variant:+/$variant}" - [ -d "$dir" ] || continue - df="$dir/Dockerfile" - slash='/' - case "$variant" in - windows/windowsservercore*) tag="${variant#*-}"; template='Dockerfile-windows-windowsservercore.template' ;; - *) tag="$alpine"; template="Dockerfile${variant:+-${variant//$slash/-}}.template" ;; - esac - sed -r \ - -e 's!%%VERSION%%!'"$version"'!g' \ - -e 's!%%DOCKER-CHANNEL%%!'"$channel"'!g' \ - -e 's!%%DOCKER-VERSION%%!'"$fullVersion"'!g' \ - -e 's!%%TAG%%!'"$tag"'!g' \ - -e 's!%%DIND-COMMIT%%!'"$dindLatest"'!g' \ - -e 's!%%ARCH-CASE%%!'"$(sed_escape_rhs "$archCase")"'!g' \ - "$template" > "$df" - - # DOCKER_TLS_CERTDIR is only enabled-by-default in 19.03+ - if [ "$majorVersion" -lt 19 ]; then - sed -ri -e 's!^(ENV DOCKER_TLS_CERTDIR=).*$!\1!' "$df" - fi - - # pigz (https://github.com/moby/moby/pull/35697) is only 18.02+ - if [ "$majorVersion" -lt 18 ] || { [ "$majorVersion" -eq 18 ] && [ "$minorVersion" -lt 2 ]; }; then - sed -ri '/pigz/d' "$df" - fi - done - - cp -a docker-entrypoint.sh modprobe.sh "$version/" - cp -a dockerd-entrypoint.sh "$version/dind/" -done +./versions.sh "$@" +./apply-templates.sh "$@" diff --git a/versions.json b/versions.json new file mode 100644 index 000000000..336eed69b --- /dev/null +++ b/versions.json @@ -0,0 +1,54 @@ +{ + "19.03": { + "alpine": "3.12", + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.13.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-19.03.13.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-19.03.13.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz" + } + }, + "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", + "variants": [ + "", + "dind", + "dind-rootless", + "git" + ], + "version": "19.03.13" + }, + "19.03-rc": { + "alpine": "3.12", + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-19.03.13-beta2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-19.03.13-beta2.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-19.03.13-beta2.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-19.03.13-beta2.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-19.03.13-beta2.tgz" + } + }, + "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", + "variants": [ + "", + "dind", + "dind-rootless", + "git" + ], + "version": "19.03.13-beta2" + } +} diff --git a/versions.sh b/versions.sh new file mode 100755 index 000000000..2f7fd43a7 --- /dev/null +++ b/versions.sh @@ -0,0 +1,145 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +defaultAlpineVersion='3.12' +declare -A alpineVersion=( + #[17.09]='3.6' +) + +# bashbrew arch to docker-release-arch +declare -A dockerArches=( + ['amd64']='x86_64' + ['arm32v6']='armel' + ['arm32v7']='armhf' + ['arm64v8']='aarch64' + ['ppc64le']='ppc64le' + ['s390x']='s390x' +# ['windows-amd64']='windows-amd64' +) + +cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" + +versions=( "$@" ) +if [ ${#versions[@]} -eq 0 ]; then + versions=( */ ) + json='{}' +else + json="$(< versions.json)" +fi +versions=( "${versions[@]%/}" ) + +# "tac|tac" for http://stackoverflow.com/a/28879552/433558 +dindLatest="$(curl -fsSL 'https://github.com/docker/docker/commits/master/hack/dind.atom' | tac|tac | awk -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')" + +dockerVersions="$( + git ls-remote --tags https://github.com/docker/docker-ce.git \ + | cut -d$'\t' -f2 \ + | grep '^refs/tags/v[0-9].*$' \ + | sed 's!^refs/tags/v!!; s!\^{}$!!' \ + | sort -u \ + | gawk ' + { data[lines++] = $0 } + + # "beta" sorts lower than "tp" even though "beta" is a more preferred release, so we need to explicitly adjust the sorting order for RCs + # also, "18.09.0-ce-beta1" vs "18.09.0-beta3" + function docker_version_compare(i1, v1, i2, v2, l, r) { + l = v1; gsub(/-ce/, "", l); gsub(/-tp/, "-alpha", l) + r = v2; gsub(/-ce/, "", r); gsub(/-tp/, "-alpha", r) + patsplit(l, ltemp, /[^.-]+/) + patsplit(r, rtemp, /[^.-]+/) + for (i = 0; i < length(ltemp) && i < length(rtemp); ++i) { + if (ltemp[i] < rtemp[i]) { + return -1 + } + if (ltemp[i] > rtemp[i]) { + return 1 + } + } + return 0 + } + + END { + asort(data, result, "docker_version_compare") + for (i in result) { + print result[i] + } + } + ' +)" + +for version in "${versions[@]}"; do + rcVersion="${version%-rc}" + channel='stable' + alpine="${alpineVersion[$version]:-$defaultAlpineVersion}" + + versionOptions="$(grep "^$rcVersion[.]" <<<"$dockerVersions")" + + rcGrepV='-v' + if [ "$rcVersion" != "$version" ]; then + rcGrepV= + channel='test' + fi + + fullVersion="$(grep $rcGrepV -E -- '-(rc|tp|beta)' <<<"$versionOptions" | tail -1)" + if [ -z "$fullVersion" ]; then + echo >&2 "warning: cannot find full version for $version" + continue + fi + + echo "$version: $fullVersion" + + export fullVersion alpine dindLatest + doc="$( + jq -nc '{ + version: env.fullVersion, + arches: {}, + alpine: env.alpine, + dindCommit: env.dindLatest, + }' + )" + + for bashbrewArch in "${!dockerArches[@]}"; do + arch="${dockerArches[$bashbrewArch]}" + # check whether the given architecture is supported for this release + url="https://download.docker.com/linux/static/$channel/$arch/docker-$fullVersion.tgz" + if wget --quiet --spider "$url" &> /dev/null; then + export bashbrewArch url + doc="$( + jq <<<"$doc" -c '.arches[env.bashbrewArch] = { + dockerUrl: env.url, + }' + )" + else + continue + fi + + rootlessExtrasUrl="https://download.docker.com/linux/static/$channel/$arch/docker-rootless-extras-$fullVersion.tgz" + # https://github.com/docker/docker-ce/blob/8fb3bb7b2210789a4471c017561c1b0de0b4f145/components/engine/hack/make/binary-daemon#L24 + # "vpnkit is amd64-only" ... for now?? + if [ "$bashbrewArch" = 'amd64' ] && wget --quiet --spider "$rootlessExtrasUrl" &> /dev/null; then + export rootlessExtrasUrl + doc="$( + jq <<<"$doc" -c \ + '.arches[env.bashbrewArch].rootlessExtrasUrl = env.rootlessExtrasUrl' + )" + fi + done + + # order here controls the order of the library/ file + for variant in \ + '' \ + dind \ + dind-rootless \ + git \ + ; do + base="${variant%%/*}" # "buster", "windows", etc. + [ -d "$version/$base" ] || continue + export variant + doc="$(jq <<<"$doc" -c '.variants += [ env.variant ]')" + done + + export version + json="$(jq <<<"$json" -c --argjson doc "$doc" '.[env.version] = $doc')" +done + +jq <<<"$json" -S . > versions.json From b6597f7fc1294f4ee3345576f06889d2ff773a8d Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 22 Oct 2020 17:01:25 -0700 Subject: [PATCH 015/667] Add 20.10.0-beta1 --- 20.10-rc/Dockerfile | 69 +++++++++++ 20.10-rc/dind-rootless/Dockerfile | 70 +++++++++++ 20.10-rc/dind/Dockerfile | 52 ++++++++ 20.10-rc/dind/dockerd-entrypoint.sh | 186 ++++++++++++++++++++++++++++ 20.10-rc/docker-entrypoint.sh | 61 +++++++++ 20.10-rc/git/Dockerfile | 9 ++ 20.10-rc/modprobe.sh | 20 +++ versions.json | 26 ++++ versions.sh | 2 +- 9 files changed, 494 insertions(+), 1 deletion(-) create mode 100644 20.10-rc/Dockerfile create mode 100644 20.10-rc/dind-rootless/Dockerfile create mode 100644 20.10-rc/dind/Dockerfile create mode 100755 20.10-rc/dind/dockerd-entrypoint.sh create mode 100755 20.10-rc/docker-entrypoint.sh create mode 100644 20.10-rc/git/Dockerfile create mode 100755 20.10-rc/modprobe.sh diff --git a/20.10-rc/Dockerfile b/20.10-rc/Dockerfile new file mode 100644 index 000000000..f9ec4e665 --- /dev/null +++ b/20.10-rc/Dockerfile @@ -0,0 +1,69 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.12 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149 +# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 +# - 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 20.10.0-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) + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-beta1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-20.10.0-beta1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-20.10.0-beta1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-beta1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O docker.tgz "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + docker --version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/20.10-rc/dind-rootless/Dockerfile b/20.10-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..d580df8e2 --- /dev/null +++ b/20.10-rc/dind-rootless/Dockerfile @@ -0,0 +1,70 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:20.10-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 +RUN apk add --no-cache iproute2 + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-beta1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O rootless.tgz "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ +# we download/build rootlesskit separately to get a newer release +# rootlesskit --version; \ + vpnkit --version + +# https://github.com/rootless-containers/rootlesskit/releases +ENV ROOTLESSKIT_VERSION 0.10.0 + +RUN set -eux; \ + apk add --no-cache --virtual .rootlesskit-build-deps \ + go \ + libc-dev \ + ; \ + wget -O rootlesskit.tgz "https://github.com/rootless-containers/rootlesskit/archive/v${ROOTLESSKIT_VERSION}.tar.gz"; \ + export GOPATH='/go'; mkdir "$GOPATH"; \ + mkdir -p "$GOPATH/src/github.com/rootless-containers/rootlesskit"; \ + tar --extract --file rootlesskit.tgz --directory "$GOPATH/src/github.com/rootless-containers/rootlesskit" --strip-components 1; \ + rm rootlesskit.tgz; \ + go build -o /usr/local/bin/rootlesskit github.com/rootless-containers/rootlesskit/cmd/rootlesskit; \ + go build -o /usr/local/bin/rootlesskit-docker-proxy github.com/rootless-containers/rootlesskit/cmd/rootlesskit-docker-proxy; \ + rm -rf "$GOPATH"; \ + apk del --no-network .rootlesskit-build-deps; \ + rootlesskit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/20.10-rc/dind/Dockerfile b/20.10-rc/dind/Dockerfile new file mode 100644 index 000000000..28321e9df --- /dev/null +++ b/20.10-rc/dind/Dockerfile @@ -0,0 +1,52 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:20.10-rc + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + iptables \ + openssl \ + shadow-uidmap \ + xfsprogs \ + xz \ +# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) + pigz \ + ; \ +# only install zfs if it's available for the current architecture +# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) +# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch + if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ + apk add --no-cache zfs; \ + fi + +# TODO aufs-tools + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -x \ + && addgroup -S dockremap \ + && adduser -S -G dockremap dockremap \ + && echo 'dockremap:165536:65536' >> /etc/subuid \ + && echo 'dockremap:165536:65536' >> /etc/subgid + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/20.10-rc/dind/dockerd-entrypoint.sh b/20.10-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..d5f59fa9e --- /dev/null +++ b/20.10-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,186 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ + && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ + ; then + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/20.10-rc/docker-entrypoint.sh b/20.10-rc/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/20.10-rc/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/20.10-rc/git/Dockerfile b/20.10-rc/git/Dockerfile new file mode 100644 index 000000000..11f2c2eed --- /dev/null +++ b/20.10-rc/git/Dockerfile @@ -0,0 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:20.10-rc + +RUN apk add --no-cache git diff --git a/20.10-rc/modprobe.sh b/20.10-rc/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/20.10-rc/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/versions.json b/versions.json index 336eed69b..74faf1271 100644 --- a/versions.json +++ b/versions.json @@ -50,5 +50,31 @@ "git" ], "version": "19.03.13-beta2" + }, + "20.10-rc": { + "alpine": "3.12", + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-beta1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-beta1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-20.10.0-beta1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-20.10.0-beta1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-beta1.tgz" + } + }, + "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", + "variants": [ + "", + "dind", + "dind-rootless", + "git" + ], + "version": "20.10.0-beta1" } } diff --git a/versions.sh b/versions.sh index 2f7fd43a7..3ed065fb7 100755 --- a/versions.sh +++ b/versions.sh @@ -32,7 +32,7 @@ versions=( "${versions[@]%/}" ) dindLatest="$(curl -fsSL 'https://github.com/docker/docker/commits/master/hack/dind.atom' | tac|tac | awk -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')" dockerVersions="$( - git ls-remote --tags https://github.com/docker/docker-ce.git \ + git ls-remote --tags https://github.com/docker/docker.git \ | cut -d$'\t' -f2 \ | grep '^refs/tags/v[0-9].*$' \ | sed 's!^refs/tags/v!!; s!\^{}$!!' \ From b1d2628005e12e79079c025c3653cba248d6f264 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 22 Oct 2020 17:02:21 -0700 Subject: [PATCH 016/667] Switch from && to ; in more places --- 19.03-rc/dind/Dockerfile | 10 +++++----- 19.03/dind/Dockerfile | 10 +++++----- 20.10-rc/dind/Dockerfile | 10 +++++----- Dockerfile-dind.template | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/19.03-rc/dind/Dockerfile b/19.03-rc/dind/Dockerfile index b6c98a168..19acf1cb9 100644 --- a/19.03-rc/dind/Dockerfile +++ b/19.03-rc/dind/Dockerfile @@ -30,11 +30,11 @@ RUN set -eux; \ # TODO aufs-tools # set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -x \ - && addgroup -S dockremap \ - && adduser -S -G dockremap dockremap \ - && echo 'dockremap:165536:65536' >> /etc/subuid \ - && echo 'dockremap:165536:65536' >> /etc/subgid +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 diff --git a/19.03/dind/Dockerfile b/19.03/dind/Dockerfile index aa10b267b..dc580c2a6 100644 --- a/19.03/dind/Dockerfile +++ b/19.03/dind/Dockerfile @@ -30,11 +30,11 @@ RUN set -eux; \ # TODO aufs-tools # set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -x \ - && addgroup -S dockremap \ - && adduser -S -G dockremap dockremap \ - && echo 'dockremap:165536:65536' >> /etc/subuid \ - && echo 'dockremap:165536:65536' >> /etc/subgid +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 diff --git a/20.10-rc/dind/Dockerfile b/20.10-rc/dind/Dockerfile index 28321e9df..084c12d08 100644 --- a/20.10-rc/dind/Dockerfile +++ b/20.10-rc/dind/Dockerfile @@ -30,11 +30,11 @@ RUN set -eux; \ # TODO aufs-tools # set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -x \ - && addgroup -S dockremap \ - && adduser -S -G dockremap dockremap \ - && echo 'dockremap:165536:65536' >> /etc/subuid \ - && echo 'dockremap:165536:65536' >> /etc/subgid +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index d0a234da0..1248fa51e 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -24,11 +24,11 @@ RUN set -eux; \ # TODO aufs-tools # set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -x \ - && addgroup -S dockremap \ - && adduser -S -G dockremap dockremap \ - && echo 'dockremap:165536:65536' >> /etc/subuid \ - && echo 'dockremap:165536:65536' >> /etc/subgid +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind ENV DIND_COMMIT {{ .dindCommit }} From eaae683d362a40f118cde7f7be936b27289d0817 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 5 Nov 2020 17:00:15 +0900 Subject: [PATCH 017/667] bump up rootlesskit to v0.11.0 Upstream PR: https://github.com/moby/moby/pull/41634 Signed-off-by: Akihiro Suda --- 19.03-rc/dind-rootless/Dockerfile | 2 +- 19.03/dind-rootless/Dockerfile | 2 +- 20.10-rc/dind-rootless/Dockerfile | 2 +- Dockerfile-dind-rootless.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/19.03-rc/dind-rootless/Dockerfile b/19.03-rc/dind-rootless/Dockerfile index 352dcddd8..057b4e2ad 100644 --- a/19.03-rc/dind-rootless/Dockerfile +++ b/19.03-rc/dind-rootless/Dockerfile @@ -44,7 +44,7 @@ RUN set -eux; \ vpnkit --version # https://github.com/rootless-containers/rootlesskit/releases -ENV ROOTLESSKIT_VERSION 0.10.0 +ENV ROOTLESSKIT_VERSION 0.11.0 RUN set -eux; \ apk add --no-cache --virtual .rootlesskit-build-deps \ diff --git a/19.03/dind-rootless/Dockerfile b/19.03/dind-rootless/Dockerfile index d0087314f..58aa29414 100644 --- a/19.03/dind-rootless/Dockerfile +++ b/19.03/dind-rootless/Dockerfile @@ -44,7 +44,7 @@ RUN set -eux; \ vpnkit --version # https://github.com/rootless-containers/rootlesskit/releases -ENV ROOTLESSKIT_VERSION 0.10.0 +ENV ROOTLESSKIT_VERSION 0.11.0 RUN set -eux; \ apk add --no-cache --virtual .rootlesskit-build-deps \ diff --git a/20.10-rc/dind-rootless/Dockerfile b/20.10-rc/dind-rootless/Dockerfile index d580df8e2..a0a5fb1e9 100644 --- a/20.10-rc/dind-rootless/Dockerfile +++ b/20.10-rc/dind-rootless/Dockerfile @@ -44,7 +44,7 @@ RUN set -eux; \ vpnkit --version # https://github.com/rootless-containers/rootlesskit/releases -ENV ROOTLESSKIT_VERSION 0.10.0 +ENV ROOTLESSKIT_VERSION 0.11.0 RUN set -eux; \ apk add --no-cache --virtual .rootlesskit-build-deps \ diff --git a/Dockerfile-dind-rootless.template b/Dockerfile-dind-rootless.template index 043d192e0..8e021b77a 100644 --- a/Dockerfile-dind-rootless.template +++ b/Dockerfile-dind-rootless.template @@ -59,7 +59,7 @@ RUN set -eux; \ vpnkit --version # https://github.com/rootless-containers/rootlesskit/releases -ENV ROOTLESSKIT_VERSION 0.10.0 +ENV ROOTLESSKIT_VERSION 0.11.0 RUN set -eux; \ apk add --no-cache --virtual .rootlesskit-build-deps \ From d4b2a80dc1f742ffcb6b94187069cca731652967 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 18 Nov 2020 06:04:28 +0000 Subject: [PATCH 018/667] Update 20.10-rc to 20.10.0-rc1 --- 20.10-rc/Dockerfile | 10 +++++----- 20.10-rc/dind-rootless/Dockerfile | 2 +- versions.json | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/20.10-rc/Dockerfile b/20.10-rc/Dockerfile index f9ec4e665..8c3eceaf2 100644 --- a/20.10-rc/Dockerfile +++ b/20.10-rc/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 20.10.0-beta1 +ENV DOCKER_VERSION 20.10.0-rc1 # 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/test/x86_64/docker-20.10.0-beta1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-rc1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-20.10.0-beta1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-20.10.0-rc1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-20.10.0-beta1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-20.10.0-rc1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-beta1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc1.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10-rc/dind-rootless/Dockerfile b/20.10-rc/dind-rootless/Dockerfile index a0a5fb1e9..50c733512 100644 --- a/20.10-rc/dind-rootless/Dockerfile +++ b/20.10-rc/dind-rootless/Dockerfile @@ -24,7 +24,7 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-beta1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-rc1.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/versions.json b/versions.json index 74faf1271..06ddd20da 100644 --- a/versions.json +++ b/versions.json @@ -55,17 +55,17 @@ "alpine": "3.12", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-beta1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-beta1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-rc1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-rc1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-20.10.0-beta1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-20.10.0-rc1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-20.10.0-beta1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-20.10.0-rc1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-beta1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc1.tgz" } }, "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", @@ -75,6 +75,6 @@ "dind-rootless", "git" ], - "version": "20.10.0-beta1" + "version": "20.10.0-rc1" } } From 5bccde5ea3335ace174f1988f2a15bb0c7943ad6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 23 Nov 2020 13:41:16 -0800 Subject: [PATCH 019/667] Remove explicit rootlesskit version We were explicit about this previously because the version included with Docker wasn't new enough, and that's no longer the case. --- 19.03-rc/dind-rootless/Dockerfile | 24 +++--------------------- 19.03/dind-rootless/Dockerfile | 24 +++--------------------- 20.10-rc/dind-rootless/Dockerfile | 24 +++--------------------- Dockerfile-dind-rootless.template | 24 +++--------------------- 4 files changed, 12 insertions(+), 84 deletions(-) diff --git a/19.03-rc/dind-rootless/Dockerfile b/19.03-rc/dind-rootless/Dockerfile index 057b4e2ad..8ff3a963a 100644 --- a/19.03-rc/dind-rootless/Dockerfile +++ b/19.03-rc/dind-rootless/Dockerfile @@ -35,33 +35,15 @@ RUN set -eux; \ --file rootless.tgz \ --strip-components 1 \ --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ 'docker-rootless-extras/vpnkit' \ ; \ rm rootless.tgz; \ \ -# we download/build rootlesskit separately to get a newer release -# rootlesskit --version; \ + rootlesskit --version; \ vpnkit --version -# https://github.com/rootless-containers/rootlesskit/releases -ENV ROOTLESSKIT_VERSION 0.11.0 - -RUN set -eux; \ - apk add --no-cache --virtual .rootlesskit-build-deps \ - go \ - libc-dev \ - ; \ - wget -O rootlesskit.tgz "https://github.com/rootless-containers/rootlesskit/archive/v${ROOTLESSKIT_VERSION}.tar.gz"; \ - export GOPATH='/go'; mkdir "$GOPATH"; \ - mkdir -p "$GOPATH/src/github.com/rootless-containers/rootlesskit"; \ - tar --extract --file rootlesskit.tgz --directory "$GOPATH/src/github.com/rootless-containers/rootlesskit" --strip-components 1; \ - rm rootlesskit.tgz; \ - go build -o /usr/local/bin/rootlesskit github.com/rootless-containers/rootlesskit/cmd/rootlesskit; \ - go build -o /usr/local/bin/rootlesskit-docker-proxy github.com/rootless-containers/rootlesskit/cmd/rootlesskit-docker-proxy; \ - rm -rf "$GOPATH"; \ - apk del --no-network .rootlesskit-build-deps; \ - rootlesskit --version - # pre-create "/var/lib/docker" for our rootless user RUN set -eux; \ mkdir -p /home/rootless/.local/share/docker; \ diff --git a/19.03/dind-rootless/Dockerfile b/19.03/dind-rootless/Dockerfile index 58aa29414..fc6fcba79 100644 --- a/19.03/dind-rootless/Dockerfile +++ b/19.03/dind-rootless/Dockerfile @@ -35,33 +35,15 @@ RUN set -eux; \ --file rootless.tgz \ --strip-components 1 \ --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ 'docker-rootless-extras/vpnkit' \ ; \ rm rootless.tgz; \ \ -# we download/build rootlesskit separately to get a newer release -# rootlesskit --version; \ + rootlesskit --version; \ vpnkit --version -# https://github.com/rootless-containers/rootlesskit/releases -ENV ROOTLESSKIT_VERSION 0.11.0 - -RUN set -eux; \ - apk add --no-cache --virtual .rootlesskit-build-deps \ - go \ - libc-dev \ - ; \ - wget -O rootlesskit.tgz "https://github.com/rootless-containers/rootlesskit/archive/v${ROOTLESSKIT_VERSION}.tar.gz"; \ - export GOPATH='/go'; mkdir "$GOPATH"; \ - mkdir -p "$GOPATH/src/github.com/rootless-containers/rootlesskit"; \ - tar --extract --file rootlesskit.tgz --directory "$GOPATH/src/github.com/rootless-containers/rootlesskit" --strip-components 1; \ - rm rootlesskit.tgz; \ - go build -o /usr/local/bin/rootlesskit github.com/rootless-containers/rootlesskit/cmd/rootlesskit; \ - go build -o /usr/local/bin/rootlesskit-docker-proxy github.com/rootless-containers/rootlesskit/cmd/rootlesskit-docker-proxy; \ - rm -rf "$GOPATH"; \ - apk del --no-network .rootlesskit-build-deps; \ - rootlesskit --version - # pre-create "/var/lib/docker" for our rootless user RUN set -eux; \ mkdir -p /home/rootless/.local/share/docker; \ diff --git a/20.10-rc/dind-rootless/Dockerfile b/20.10-rc/dind-rootless/Dockerfile index 50c733512..450b14018 100644 --- a/20.10-rc/dind-rootless/Dockerfile +++ b/20.10-rc/dind-rootless/Dockerfile @@ -35,33 +35,15 @@ RUN set -eux; \ --file rootless.tgz \ --strip-components 1 \ --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ 'docker-rootless-extras/vpnkit' \ ; \ rm rootless.tgz; \ \ -# we download/build rootlesskit separately to get a newer release -# rootlesskit --version; \ + rootlesskit --version; \ vpnkit --version -# https://github.com/rootless-containers/rootlesskit/releases -ENV ROOTLESSKIT_VERSION 0.11.0 - -RUN set -eux; \ - apk add --no-cache --virtual .rootlesskit-build-deps \ - go \ - libc-dev \ - ; \ - wget -O rootlesskit.tgz "https://github.com/rootless-containers/rootlesskit/archive/v${ROOTLESSKIT_VERSION}.tar.gz"; \ - export GOPATH='/go'; mkdir "$GOPATH"; \ - mkdir -p "$GOPATH/src/github.com/rootless-containers/rootlesskit"; \ - tar --extract --file rootlesskit.tgz --directory "$GOPATH/src/github.com/rootless-containers/rootlesskit" --strip-components 1; \ - rm rootlesskit.tgz; \ - go build -o /usr/local/bin/rootlesskit github.com/rootless-containers/rootlesskit/cmd/rootlesskit; \ - go build -o /usr/local/bin/rootlesskit-docker-proxy github.com/rootless-containers/rootlesskit/cmd/rootlesskit-docker-proxy; \ - rm -rf "$GOPATH"; \ - apk del --no-network .rootlesskit-build-deps; \ - rootlesskit --version - # pre-create "/var/lib/docker" for our rootless user RUN set -eux; \ mkdir -p /home/rootless/.local/share/docker; \ diff --git a/Dockerfile-dind-rootless.template b/Dockerfile-dind-rootless.template index 8e021b77a..691663c1d 100644 --- a/Dockerfile-dind-rootless.template +++ b/Dockerfile-dind-rootless.template @@ -50,33 +50,15 @@ RUN set -eux; \ --file rootless.tgz \ --strip-components 1 \ --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ 'docker-rootless-extras/vpnkit' \ ; \ rm rootless.tgz; \ \ -# we download/build rootlesskit separately to get a newer release -# rootlesskit --version; \ + rootlesskit --version; \ vpnkit --version -# https://github.com/rootless-containers/rootlesskit/releases -ENV ROOTLESSKIT_VERSION 0.11.0 - -RUN set -eux; \ - apk add --no-cache --virtual .rootlesskit-build-deps \ - go \ - libc-dev \ - ; \ - wget -O rootlesskit.tgz "https://github.com/rootless-containers/rootlesskit/archive/v${ROOTLESSKIT_VERSION}.tar.gz"; \ - export GOPATH='/go'; mkdir "$GOPATH"; \ - mkdir -p "$GOPATH/src/github.com/rootless-containers/rootlesskit"; \ - tar --extract --file rootlesskit.tgz --directory "$GOPATH/src/github.com/rootless-containers/rootlesskit" --strip-components 1; \ - rm rootlesskit.tgz; \ - go build -o /usr/local/bin/rootlesskit github.com/rootless-containers/rootlesskit/cmd/rootlesskit; \ - go build -o /usr/local/bin/rootlesskit-docker-proxy github.com/rootless-containers/rootlesskit/cmd/rootlesskit-docker-proxy; \ - rm -rf "$GOPATH"; \ - apk del --no-network .rootlesskit-build-deps; \ - rootlesskit --version - # pre-create "/var/lib/docker" for our rootless user RUN set -eux; \ mkdir -p /home/rootless/.local/share/docker; \ From c8b077bfbab07a33ba5c80e5d4987fba8bbdd67b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 2 Dec 2020 00:04:18 +0000 Subject: [PATCH 020/667] Update 19.03 to 19.03.14 --- 19.03/Dockerfile | 10 +++++----- 19.03/dind-rootless/Dockerfile | 2 +- versions.json | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/19.03/Dockerfile b/19.03/Dockerfile index 395b13a33..d8c79f23a 100644 --- a/19.03/Dockerfile +++ b/19.03/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.13 +ENV DOCKER_VERSION 19.03.14 # 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.13.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-19.03.14.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-19.03.13.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-19.03.14.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-19.03.13.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-19.03.14.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-19.03.14.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/19.03/dind-rootless/Dockerfile b/19.03/dind-rootless/Dockerfile index fc6fcba79..2595dbfcf 100644 --- a/19.03/dind-rootless/Dockerfile +++ b/19.03/dind-rootless/Dockerfile @@ -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.13.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.14.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/versions.json b/versions.json index 06ddd20da..b7960dec4 100644 --- a/versions.json +++ b/versions.json @@ -3,17 +3,17 @@ "alpine": "3.12", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.13.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.13.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.14.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.14.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-19.03.13.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-19.03.14.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-19.03.13.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-19.03.14.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-19.03.13.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-19.03.14.tgz" } }, "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", @@ -23,7 +23,7 @@ "dind-rootless", "git" ], - "version": "19.03.13" + "version": "19.03.14" }, "19.03-rc": { "alpine": "3.12", From bf1c9f5393c9c60460567a8e8bdf1b0d0e41acbc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 2 Dec 2020 23:44:06 +0000 Subject: [PATCH 021/667] Update 20.10-rc to 20.10.0-rc2 --- 20.10-rc/Dockerfile | 10 +++++----- 20.10-rc/dind-rootless/Dockerfile | 2 +- versions.json | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/20.10-rc/Dockerfile b/20.10-rc/Dockerfile index 8c3eceaf2..0e1ab7a10 100644 --- a/20.10-rc/Dockerfile +++ b/20.10-rc/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 20.10.0-rc1 +ENV DOCKER_VERSION 20.10.0-rc2 # 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/test/x86_64/docker-20.10.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-rc2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-20.10.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-20.10.0-rc2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-20.10.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-20.10.0-rc2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc2.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10-rc/dind-rootless/Dockerfile b/20.10-rc/dind-rootless/Dockerfile index 450b14018..865c2113b 100644 --- a/20.10-rc/dind-rootless/Dockerfile +++ b/20.10-rc/dind-rootless/Dockerfile @@ -24,7 +24,7 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-rc2.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/versions.json b/versions.json index b7960dec4..ddbc18c9d 100644 --- a/versions.json +++ b/versions.json @@ -55,17 +55,17 @@ "alpine": "3.12", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-rc1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-rc1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-rc2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-rc2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-20.10.0-rc1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-20.10.0-rc2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-20.10.0-rc1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-20.10.0-rc2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc2.tgz" } }, "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", @@ -75,6 +75,6 @@ "dind-rootless", "git" ], - "version": "20.10.0-rc1" + "version": "20.10.0-rc2" } } From 387e351394bfad74bceebf8303c6c8e39c3d4ed4 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 9 Dec 2020 09:40:06 -0800 Subject: [PATCH 022/667] Update to 20.10.0 (GA) --- 20.10/Dockerfile | 69 ++++++++++++ 20.10/dind-rootless/Dockerfile | 52 +++++++++ 20.10/dind/Dockerfile | 52 +++++++++ 20.10/dind/dockerd-entrypoint.sh | 186 +++++++++++++++++++++++++++++++ 20.10/docker-entrypoint.sh | 61 ++++++++++ 20.10/git/Dockerfile | 9 ++ 20.10/modprobe.sh | 20 ++++ versions.json | 26 +++++ 8 files changed, 475 insertions(+) create mode 100644 20.10/Dockerfile create mode 100644 20.10/dind-rootless/Dockerfile create mode 100644 20.10/dind/Dockerfile create mode 100755 20.10/dind/dockerd-entrypoint.sh create mode 100755 20.10/docker-entrypoint.sh create mode 100644 20.10/git/Dockerfile create mode 100755 20.10/modprobe.sh diff --git a/20.10/Dockerfile b/20.10/Dockerfile new file mode 100644 index 000000000..51fc4f43b --- /dev/null +++ b/20.10/Dockerfile @@ -0,0 +1,69 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.12 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149 +# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 +# - 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 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) + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + 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-20.10.0.tgz'; \ + ;; \ + 'armv7') \ + 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-20.10.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O docker.tgz "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + docker --version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile new file mode 100644 index 000000000..a2a741b66 --- /dev/null +++ b/20.10/dind-rootless/Dockerfile @@ -0,0 +1,52 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +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 +RUN apk add --no-cache iproute2 + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +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-20.10.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O rootless.tgz "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile new file mode 100644 index 000000000..3c02f486b --- /dev/null +++ b/20.10/dind/Dockerfile @@ -0,0 +1,52 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:20.10 + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + iptables \ + openssl \ + shadow-uidmap \ + xfsprogs \ + xz \ +# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) + pigz \ + ; \ +# only install zfs if it's available for the current architecture +# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) +# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch + if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ + apk add --no-cache zfs; \ + fi + +# TODO aufs-tools + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/20.10/dind/dockerd-entrypoint.sh b/20.10/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..d5f59fa9e --- /dev/null +++ b/20.10/dind/dockerd-entrypoint.sh @@ -0,0 +1,186 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ + && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ + ; then + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/20.10/docker-entrypoint.sh b/20.10/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/20.10/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/20.10/git/Dockerfile b/20.10/git/Dockerfile new file mode 100644 index 000000000..d23654fd2 --- /dev/null +++ b/20.10/git/Dockerfile @@ -0,0 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:20.10 + +RUN apk add --no-cache git diff --git a/20.10/modprobe.sh b/20.10/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/20.10/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/versions.json b/versions.json index ddbc18c9d..f9d9e7c37 100644 --- a/versions.json +++ b/versions.json @@ -51,6 +51,32 @@ ], "version": "19.03.13-beta2" }, + "20.10": { + "alpine": "3.12", + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.0.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.0.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.0.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz" + } + }, + "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", + "variants": [ + "", + "dind", + "dind-rootless", + "git" + ], + "version": "20.10.0" + }, "20.10-rc": { "alpine": "3.12", "arches": { From 40e904c923978f88149e71dbabc8dd1dfd13291c Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 9 Dec 2020 09:42:56 -0800 Subject: [PATCH 023/667] Add missing gitattributes file --- .gitattributes | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..c70f75d2c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +/*/**/Dockerfile linguist-generated +/*/**/docker-entrypoint.sh linguist-generated +/*/**/dockerd-entrypoint.sh linguist-generated +/*/**/modprobe.sh linguist-generated +/Dockerfile*.template linguist-language=Dockerfile From 094faa88f437cafef7aeb0cc36e75b59046cc4b9 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 11 Dec 2020 12:28:57 -0800 Subject: [PATCH 024/667] Add ip6tables in 20.10+ Docker 20.10+ now supports ip6tables! --- 20.10-rc/dind/Dockerfile | 1 + 20.10/dind/Dockerfile | 1 + Dockerfile-dind.template | 3 +++ 3 files changed, 5 insertions(+) diff --git a/20.10-rc/dind/Dockerfile b/20.10-rc/dind/Dockerfile index 084c12d08..d57fd84f4 100644 --- a/20.10-rc/dind/Dockerfile +++ b/20.10-rc/dind/Dockerfile @@ -12,6 +12,7 @@ RUN set -eux; \ btrfs-progs \ e2fsprogs \ e2fsprogs-extra \ + ip6tables \ iptables \ openssl \ shadow-uidmap \ diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index 3c02f486b..551ff332e 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/Dockerfile @@ -12,6 +12,7 @@ RUN set -eux; \ btrfs-progs \ e2fsprogs \ e2fsprogs-extra \ + ip6tables \ iptables \ openssl \ shadow-uidmap \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 1248fa51e..6e25a1a9a 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -6,6 +6,9 @@ RUN set -eux; \ btrfs-progs \ e2fsprogs \ e2fsprogs-extra \ +{{ if ["19.03", "19.03-rc"] | index(env.version) | not then ( -}} + ip6tables \ +{{ ) else "" end -}} iptables \ openssl \ shadow-uidmap \ From a7534626601bce99a23f0496a3f659616522ed22 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 15 Dec 2020 06:05:28 +0000 Subject: [PATCH 025/667] Update 20.10 to 20.10.1 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 2 +- versions.json | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 51fc4f43b..f569312cb 100644 --- a/20.10/Dockerfile +++ b/20.10/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 20.10.0 +ENV DOCKER_VERSION 20.10.1 # 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-20.10.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index a2a741b66..e7ad94ab7 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -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-20.10.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/versions.json b/versions.json index f9d9e7c37..6537cc325 100644 --- a/versions.json +++ b/versions.json @@ -55,17 +55,17 @@ "alpine": "3.12", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz" } }, "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", @@ -75,7 +75,7 @@ "dind-rootless", "git" ], - "version": "20.10.0" + "version": "20.10.1" }, "20.10-rc": { "alpine": "3.12", From 72ed002682df9e778da1fc8f0aa2ea1a0b9a3986 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 5 Jan 2021 12:04:15 +0000 Subject: [PATCH 026/667] Update 20.10 to 20.10.2 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 2 +- versions.json | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index f569312cb..cf302cc26 100644 --- a/20.10/Dockerfile +++ b/20.10/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 20.10.1 +ENV DOCKER_VERSION 20.10.2 # 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-20.10.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index e7ad94ab7..4a80e7ab6 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -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-20.10.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/versions.json b/versions.json index 6537cc325..adb8ff5ad 100644 --- a/versions.json +++ b/versions.json @@ -55,17 +55,17 @@ "alpine": "3.12", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.2.tgz" } }, "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", @@ -75,7 +75,7 @@ "dind-rootless", "git" ], - "version": "20.10.1" + "version": "20.10.2" }, "20.10-rc": { "alpine": "3.12", From a2c353027fd5479cfcafeb1f055bb1b5f2ea4ed3 Mon Sep 17 00:00:00 2001 From: Martin Rauscher Date: Thu, 28 Jan 2021 16:46:04 +0100 Subject: [PATCH 027/667] update to alpine 3.13 Signed-off-by: Martin Rauscher --- 19.03-rc/Dockerfile | 2 +- 19.03/Dockerfile | 2 +- 20.10-rc/Dockerfile | 2 +- 20.10/Dockerfile | 2 +- versions.json | 8 ++++---- versions.sh | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/19.03-rc/Dockerfile b/19.03-rc/Dockerfile index 0d34e9289..913a8606f 100644 --- a/19.03-rc/Dockerfile +++ b/19.03-rc/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.13 RUN apk add --no-cache \ ca-certificates \ diff --git a/19.03/Dockerfile b/19.03/Dockerfile index d8c79f23a..97828fdf4 100644 --- a/19.03/Dockerfile +++ b/19.03/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.13 RUN apk add --no-cache \ ca-certificates \ diff --git a/20.10-rc/Dockerfile b/20.10-rc/Dockerfile index 0e1ab7a10..500381795 100644 --- a/20.10-rc/Dockerfile +++ b/20.10-rc/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.13 RUN apk add --no-cache \ ca-certificates \ diff --git a/20.10/Dockerfile b/20.10/Dockerfile index cf302cc26..20b120992 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.12 +FROM alpine:3.13 RUN apk add --no-cache \ ca-certificates \ diff --git a/versions.json b/versions.json index adb8ff5ad..8f3a21629 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "19.03": { - "alpine": "3.12", + "alpine": "3.13", "arches": { "amd64": { "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.14.tgz", @@ -26,7 +26,7 @@ "version": "19.03.14" }, "19.03-rc": { - "alpine": "3.12", + "alpine": "3.13", "arches": { "amd64": { "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-19.03.13-beta2.tgz", @@ -52,7 +52,7 @@ "version": "19.03.13-beta2" }, "20.10": { - "alpine": "3.12", + "alpine": "3.13", "arches": { "amd64": { "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.2.tgz", @@ -78,7 +78,7 @@ "version": "20.10.2" }, "20.10-rc": { - "alpine": "3.12", + "alpine": "3.13", "arches": { "amd64": { "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-rc2.tgz", diff --git a/versions.sh b/versions.sh index 3ed065fb7..a4aba6d1f 100755 --- a/versions.sh +++ b/versions.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -Eeuo pipefail -defaultAlpineVersion='3.12' +defaultAlpineVersion='3.13' declare -A alpineVersion=( #[17.09]='3.6' ) From 835c371c516ebdf67adc0c76bbfb38bf9d3e586c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 1 Feb 2021 23:55:47 +0000 Subject: [PATCH 028/667] Update 19.03 to 19.03.15 --- 19.03/Dockerfile | 10 +++++----- 19.03/dind-rootless/Dockerfile | 2 +- versions.json | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/19.03/Dockerfile b/19.03/Dockerfile index 97828fdf4..3cae2ffcd 100644 --- a/19.03/Dockerfile +++ b/19.03/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 19.03.15 # 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-19.03.15.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-19.03.15.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-19.03.15.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-19.03.15.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/19.03/dind-rootless/Dockerfile b/19.03/dind-rootless/Dockerfile index 2595dbfcf..b0b542755 100644 --- a/19.03/dind-rootless/Dockerfile +++ b/19.03/dind-rootless/Dockerfile @@ -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-19.03.15.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/versions.json b/versions.json index 8f3a21629..a8b60207a 100644 --- a/versions.json +++ b/versions.json @@ -3,17 +3,17 @@ "alpine": "3.13", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.14.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.14.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.15.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.15.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-19.03.14.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-19.03.15.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-19.03.14.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-19.03.15.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-19.03.14.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz" } }, "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", @@ -23,7 +23,7 @@ "dind-rootless", "git" ], - "version": "19.03.14" + "version": "19.03.15" }, "19.03-rc": { "alpine": "3.13", From ec5d64f9611da8f8b19c9c5c4acc04b9397174e6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 1 Feb 2021 23:57:59 +0000 Subject: [PATCH 029/667] Update 20.10 to 20.10.3 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 2 +- versions.json | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 20b120992..afc8afccd 100644 --- a/20.10/Dockerfile +++ b/20.10/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 20.10.2 +ENV DOCKER_VERSION 20.10.3 # 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-20.10.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 4a80e7ab6..6da56ebb2 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -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-20.10.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/versions.json b/versions.json index a8b60207a..1b5144334 100644 --- a/versions.json +++ b/versions.json @@ -55,17 +55,17 @@ "alpine": "3.13", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.3.tgz" } }, "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", @@ -75,7 +75,7 @@ "dind-rootless", "git" ], - "version": "20.10.2" + "version": "20.10.3" }, "20.10-rc": { "alpine": "3.13", From d60bf352d0e0e0e9783984138dcac2508b3a281f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 26 Feb 2021 18:04:23 +0000 Subject: [PATCH 030/667] Update 20.10 to 20.10.4 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 2 +- versions.json | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index afc8afccd..caf4fe3b5 100644 --- a/20.10/Dockerfile +++ b/20.10/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 20.10.3 +ENV DOCKER_VERSION 20.10.4 # 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-20.10.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 6da56ebb2..04120b52f 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -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-20.10.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/versions.json b/versions.json index 1b5144334..0b0ce84d5 100644 --- a/versions.json +++ b/versions.json @@ -55,17 +55,17 @@ "alpine": "3.13", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.4.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.4.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.4.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.4.tgz" } }, "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", @@ -75,7 +75,7 @@ "dind-rootless", "git" ], - "version": "20.10.3" + "version": "20.10.4" }, "20.10-rc": { "alpine": "3.13", From 9728dce92752348ac2623bcf96436f1a89e15dd3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 2 Mar 2021 23:33:26 +0000 Subject: [PATCH 031/667] Update 20.10 to 20.10.5 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 2 +- versions.json | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index caf4fe3b5..12b277a22 100644 --- a/20.10/Dockerfile +++ b/20.10/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 20.10.4 +ENV DOCKER_VERSION 20.10.5 # 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-20.10.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.5.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.5.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 04120b52f..31a18da19 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -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-20.10.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/versions.json b/versions.json index 0b0ce84d5..794fd9731 100644 --- a/versions.json +++ b/versions.json @@ -55,17 +55,17 @@ "alpine": "3.13", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.5.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.5.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.5.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.5.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.5.tgz" } }, "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", @@ -75,7 +75,7 @@ "dind-rootless", "git" ], - "version": "20.10.4" + "version": "20.10.5" }, "20.10-rc": { "alpine": "3.13", From f6a0c427f0354dcf5870c430c72c8f1d6b4e6d5e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 12 Apr 2021 17:04:30 +0000 Subject: [PATCH 032/667] Update 20.10 to 20.10.6 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 2 +- versions.json | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 12b277a22..c2828e29a 100644 --- a/20.10/Dockerfile +++ b/20.10/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 20.10.5 +ENV DOCKER_VERSION 20.10.6 # 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-20.10.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.6.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.6.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.6.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 31a18da19..8aa0c651e 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -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-20.10.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.6.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/versions.json b/versions.json index 794fd9731..8bfe01c36 100644 --- a/versions.json +++ b/versions.json @@ -55,17 +55,17 @@ "alpine": "3.13", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.5.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.6.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.6.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.6.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.6.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz" } }, "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", @@ -75,7 +75,7 @@ "dind-rootless", "git" ], - "version": "20.10.5" + "version": "20.10.6" }, "20.10-rc": { "alpine": "3.13", From f0abe5a51a683c02501fd7ff8384fb17dbbeb946 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 30 Apr 2021 11:04:23 +0000 Subject: [PATCH 033/667] Update 19.03 --- 19.03/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/19.03/dind/Dockerfile b/19.03/dind/Dockerfile index dc580c2a6..bc4c09ca9 100644 --- a/19.03/dind/Dockerfile +++ b/19.03/dind/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 +ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index 8bfe01c36..60e0b739e 100644 --- a/versions.json +++ b/versions.json @@ -16,7 +16,7 @@ "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz" } }, - "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", + "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ "", "dind", From 52daee74d143cc4010a8f7c0e8f7c9336a504258 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 30 Apr 2021 11:07:38 +0000 Subject: [PATCH 034/667] Update 19.03-rc --- 19.03-rc/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/19.03-rc/dind/Dockerfile b/19.03-rc/dind/Dockerfile index 19acf1cb9..a67958dc6 100644 --- a/19.03-rc/dind/Dockerfile +++ b/19.03-rc/dind/Dockerfile @@ -37,7 +37,7 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 +ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index 60e0b739e..0f2951496 100644 --- a/versions.json +++ b/versions.json @@ -42,7 +42,7 @@ "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-19.03.13-beta2.tgz" } }, - "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", + "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ "", "dind", From 30d7b9bf7663c96fcd888bd75e9aaa547a808a23 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 30 Apr 2021 11:07:44 +0000 Subject: [PATCH 035/667] Update 20.10 --- 20.10/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index 551ff332e..b319a2b06 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/Dockerfile @@ -38,7 +38,7 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 +ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index 0f2951496..a4a0f54eb 100644 --- a/versions.json +++ b/versions.json @@ -68,7 +68,7 @@ "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz" } }, - "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", + "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ "", "dind", From d0d3a6a2abcdde3a8d1530e8df9f5c8bd353a2c7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 30 Apr 2021 11:10:51 +0000 Subject: [PATCH 036/667] Update 20.10-rc --- 20.10-rc/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/20.10-rc/dind/Dockerfile b/20.10-rc/dind/Dockerfile index d57fd84f4..98a14e0c3 100644 --- a/20.10-rc/dind/Dockerfile +++ b/20.10-rc/dind/Dockerfile @@ -38,7 +38,7 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subgid # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT ed89041433a031cafc0a0f19cfe573c31688d377 +ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index a4a0f54eb..dbeba07b9 100644 --- a/versions.json +++ b/versions.json @@ -94,7 +94,7 @@ "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc2.tgz" } }, - "dindCommit": "ed89041433a031cafc0a0f19cfe573c31688d377", + "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ "", "dind", From 01ecb284d31bd8253dcf37a8a353bc5f7ecbb7de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kry=C5=A1tof=20Wold=C5=99ich?= Date: Tue, 1 Jun 2021 15:20:30 +0200 Subject: [PATCH 037/667] Add back Windows variant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://download.docker.com/win/static/stable/x86_64/ 🎉 Co-authored-by: Tianon Gravi --- .../windows/windowsservercore-1809/Dockerfile | 40 +++++++++++++++++++ ... => Dockerfile-windows-servercore.template | 11 +++-- Dockerfile.template | 2 +- apply-templates.sh | 23 +++++++++-- generate-stackbrew-library.sh | 28 +++++++++++-- versions.json | 6 ++- versions.sh | 17 +++++++- 7 files changed, 109 insertions(+), 18 deletions(-) create mode 100644 20.10/windows/windowsservercore-1809/Dockerfile rename Dockerfile-windows-windowsservercore.template => Dockerfile-windows-servercore.template (78%) diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..e7489b8fe --- /dev/null +++ b/20.10/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,40 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 20.10.6 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.6.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; diff --git a/Dockerfile-windows-windowsservercore.template b/Dockerfile-windows-servercore.template similarity index 78% rename from Dockerfile-windows-windowsservercore.template rename to Dockerfile-windows-servercore.template index 89ad458cb..8b1f2628c 100644 --- a/Dockerfile-windows-windowsservercore.template +++ b/Dockerfile-windows-servercore.template @@ -1,4 +1,4 @@ -FROM microsoft/windowsservercore:%%TAG%% +FROM mcr.microsoft.com/windows/{{ env.windowsVariant }}:{{ env.windowsRelease }} # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] @@ -9,15 +9,14 @@ 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_CHANNEL %%DOCKER-CHANNEL%% -ENV DOCKER_VERSION %%DOCKER-VERSION%% +ENV DOCKER_VERSION {{ .version }} +ENV DOCKER_URL {{ .arches["windows-amd64"].dockerUrl }} # 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) -RUN $url = ('https://download.docker.com/win/static/{0}/x86_64/docker-{1}.zip' -f $env:DOCKER_CHANNEL, $env:DOCKER_VERSION); \ - Write-Host ('Downloading {0} ...' -f $url); \ - Invoke-WebRequest -Uri $url -OutFile 'docker.zip'; \ +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ \ Write-Host 'Expanding ...'; \ Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ diff --git a/Dockerfile.template b/Dockerfile.template index a51f771a5..3b7dac846 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -23,7 +23,7 @@ RUN set -eux; \ {{ [ .arches | to_entries[] - | select(.value.dockerUrl) + | select(.value.dockerUrl and (.key | startswith("windows-") | not)) | .key as $bashbrewArch | ( { diff --git a/apply-templates.sh b/apply-templates.sh index 65a4cbbf9..ca7de349e 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -33,13 +33,28 @@ for version; do eval "variants=( $variants )" for variant in "${variants[@]}"; do - template="Dockerfile${variant:+-$variant}.template" - target="$version${variant:+/$variant}/Dockerfile" - + dir="$version${variant:+/$variant}" + + case "$variant" in + windows/*) + variant="$(basename "$variant")" # "windowsservercore-1809", etc + windowsVariant="${variant%%-*}" # "windowsservercore", "nanoserver" + windowsRelease="${variant#$windowsVariant-}" # "1809", "ltsc2016", etc + windowsVariant="${windowsVariant#windows}" # "servercore", "nanoserver" + export windowsVariant windowsRelease + template="Dockerfile-windows-$windowsVariant.template" + ;; + + *) + template="Dockerfile${variant:+-$variant}.template" + ;; + esac + + mkdir -p "$dir" { generated_warning gawk -f "$jqt" "$template" - } > "$target" + } > "$dir/Dockerfile" done cp -a docker-entrypoint.sh modprobe.sh "$version/" diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 24f0a69b1..58fa4c731 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -55,6 +55,15 @@ versionArches() { selector='rootlessExtrasUrl' fi + if [[ "$variant" = windows/* ]]; then + version="$version" jq -r ' + .[env.version].arches + | keys[] + | select(startswith("windows-")) + ' versions.json | sort + return + fi + local parent parentArches parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")" parentArches="${parentRepoToArches[$parent]:-}" @@ -154,21 +163,32 @@ for version; do variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)" eval "variants=( $variants )" - for variant in "${variants[@]}"; do - dir="$version${variant:+/$variant}" + for v in "${variants[@]}"; do + dir="$version${v:+/$v}" [ -f "$dir/Dockerfile" ] || continue commit="$(dirCommit "$dir")" + variant="$(basename "$v")" variantAliases=( "${versionAliases[@]/%/${variant:+-$variant}}" ) variantAliases=( "${variantAliases[@]//latest-/}" ) + sharedTags=() + if [[ "$variant" == windowsservercore* ]]; then + sharedTags=( "${versionAliases[@]/%/-windowsservercore}" ) + sharedTags=( "${sharedTags[@]//latest-/}" ) + fi + echo + echo "Tags: $(join ', ' "${variantAliases[@]}")" + if [ "${#sharedTags[@]}" -gt 0 ]; then + echo "SharedTags: $(join ', ' "${sharedTags[@]}")" + fi cat <<-EOE - Tags: $(join ', ' "${variantAliases[@]}") - Architectures: $(join ', ' $(versionArches "$version" "$variant")) + Architectures: $(join ', ' $(versionArches "$version" "$v")) GitCommit: $commit Directory: $dir EOE + [ "$variant" = "$v" ] || echo "Constraints: $variant" done done diff --git a/versions.json b/versions.json index dbeba07b9..bb19943d7 100644 --- a/versions.json +++ b/versions.json @@ -66,6 +66,9 @@ }, "arm64v8": { "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.6.zip" } }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", @@ -73,7 +76,8 @@ "", "dind", "dind-rootless", - "git" + "git", + "windows/windowsservercore-1809" ], "version": "20.10.6" }, diff --git a/versions.sh b/versions.sh index a4aba6d1f..de0a4f64d 100755 --- a/versions.sh +++ b/versions.sh @@ -14,7 +14,7 @@ declare -A dockerArches=( ['arm64v8']='aarch64' ['ppc64le']='ppc64le' ['s390x']='s390x' -# ['windows-amd64']='windows-amd64' + ['windows-amd64']='x86_64' ) cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" @@ -98,10 +98,14 @@ for version in "${versions[@]}"; do }' )" + hasWindows= for bashbrewArch in "${!dockerArches[@]}"; do arch="${dockerArches[$bashbrewArch]}" # check whether the given architecture is supported for this release - url="https://download.docker.com/linux/static/$channel/$arch/docker-$fullVersion.tgz" + case "$bashbrewArch" in + windows-*) url="https://download.docker.com/win/static/$channel/$arch/docker-$fullVersion.zip"; windows=1 ;; + *) url="https://download.docker.com/linux/static/$channel/$arch/docker-$fullVersion.tgz"; windows= ;; + esac if wget --quiet --spider "$url" &> /dev/null; then export bashbrewArch url doc="$( @@ -113,6 +117,11 @@ for version in "${versions[@]}"; do continue fi + if [ -n "$windows" ]; then + hasWindows=1 + continue # Windows doesn't have rootless extras :) + fi + rootlessExtrasUrl="https://download.docker.com/linux/static/$channel/$arch/docker-rootless-extras-$fullVersion.tgz" # https://github.com/docker/docker-ce/blob/8fb3bb7b2210789a4471c017561c1b0de0b4f145/components/engine/hack/make/binary-daemon#L24 # "vpnkit is amd64-only" ... for now?? @@ -131,9 +140,13 @@ for version in "${versions[@]}"; do dind \ dind-rootless \ git \ + windows/windowsservercore-1809 \ ; do base="${variant%%/*}" # "buster", "windows", etc. [ -d "$version/$base" ] || continue + if [ "$base" = 'windows' ] && [ -z "$hasWindows" ]; then + continue + fi export variant doc="$(jq <<<"$doc" -c '.variants += [ env.variant ]')" done From 279ba9c93e8e26a15171645bd511ea8476c4706e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 2 Jun 2021 14:13:28 -0700 Subject: [PATCH 038/667] Update 20.10 to 20.10.7 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 2 +- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- versions.json | 14 +++++++------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index c2828e29a..c56ad6d6e 100644 --- a/20.10/Dockerfile +++ b/20.10/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 20.10.6 +ENV DOCKER_VERSION 20.10.7 # 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-20.10.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.7.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.7.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.7.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 8aa0c651e..660b223e6 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -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-20.10.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.7.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index e7489b8fe..159898e64 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.6 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.6.zip +ENV DOCKER_VERSION 20.10.7 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.7.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/versions.json b/versions.json index bb19943d7..3e05ff580 100644 --- a/versions.json +++ b/versions.json @@ -55,20 +55,20 @@ "alpine": "3.13", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.6.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.6.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.7.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.7.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.6.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.7.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.6.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.7.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.6.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.7.zip" } }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", @@ -79,7 +79,7 @@ "git", "windows/windowsservercore-1809" ], - "version": "20.10.6" + "version": "20.10.7" }, "20.10-rc": { "alpine": "3.13", From 2ab877f315206028bb9352d86e28c71b25723bf2 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 25 Jun 2021 14:43:34 -0700 Subject: [PATCH 039/667] Enable rootless-extras on arm64 for 20.10+ --- 20.10-rc/dind-rootless/Dockerfile | 3 +++ 20.10/dind-rootless/Dockerfile | 3 +++ versions.json | 6 ++++-- versions.sh | 26 +++++++++++++++++--------- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/20.10-rc/dind-rootless/Dockerfile b/20.10-rc/dind-rootless/Dockerfile index 865c2113b..42bd38123 100644 --- a/20.10-rc/dind-rootless/Dockerfile +++ b/20.10-rc/dind-rootless/Dockerfile @@ -26,6 +26,9 @@ RUN set -eux; \ 'x86_64') \ url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-rc2.tgz'; \ ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-20.10.0-rc2.tgz'; \ + ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 660b223e6..117458781 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -26,6 +26,9 @@ RUN set -eux; \ 'x86_64') \ url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.7.tgz'; \ ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.7.tgz'; \ + ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ \ diff --git a/versions.json b/versions.json index 3e05ff580..b44e72382 100644 --- a/versions.json +++ b/versions.json @@ -65,7 +65,8 @@ "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.7.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.7.tgz" }, "windows-amd64": { "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.7.zip" @@ -95,7 +96,8 @@ "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-20.10.0-rc2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-20.10.0-rc2.tgz" } }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", diff --git a/versions.sh b/versions.sh index de0a4f64d..6118b1d67 100755 --- a/versions.sh +++ b/versions.sh @@ -122,16 +122,24 @@ for version in "${versions[@]}"; do continue # Windows doesn't have rootless extras :) fi - rootlessExtrasUrl="https://download.docker.com/linux/static/$channel/$arch/docker-rootless-extras-$fullVersion.tgz" - # https://github.com/docker/docker-ce/blob/8fb3bb7b2210789a4471c017561c1b0de0b4f145/components/engine/hack/make/binary-daemon#L24 - # "vpnkit is amd64-only" ... for now?? - if [ "$bashbrewArch" = 'amd64' ] && wget --quiet --spider "$rootlessExtrasUrl" &> /dev/null; then - export rootlessExtrasUrl - doc="$( - jq <<<"$doc" -c \ - '.arches[env.bashbrewArch].rootlessExtrasUrl = env.rootlessExtrasUrl' - )" + if [ "$rcVersion" = '19.03' ] && [ "$bashbrewArch" != 'amd64' ]; then + # https://github.com/moby/moby/blob/v19.03.15/hack/make/binary-daemon#L24 + # "vpnkit is amd64 only" + continue fi + # https://github.com/moby/moby/blob/v20.10.7/hack/make/binary-daemon#L24 + # "vpnkit is available for x86_64 and aarch64" + case "$bashbrewArch" in + amd64 | arm64v8) + rootlessExtrasUrl="https://download.docker.com/linux/static/$channel/$arch/docker-rootless-extras-$fullVersion.tgz" + if wget --quiet --spider "$rootlessExtrasUrl" &> /dev/null; then + export rootlessExtrasUrl + doc="$(jq <<<"$doc" -c ' + .arches[env.bashbrewArch].rootlessExtrasUrl = env.rootlessExtrasUrl + ')" + fi + ;; + esac done # order here controls the order of the library/ file From 2a72a42875fc3ad96aaae69e9cdb28c46321f2e7 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 6 Jul 2021 10:51:07 -0700 Subject: [PATCH 040/667] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 32bf88efe..620a70c0c 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,6 @@ For outstanding `docker` image PRs, check [PRs with the "library/docker" label o | Build | Status | Badges | (per-arch) | |:-:|:-:|:-:|:-:| | [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker/) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker/) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker/) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker/) | -| [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/docker.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/docker/) | +| [![windows-amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/docker.svg?label=windows-amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/docker/) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/docker.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/docker/) | From 8baa881aab85f8398d2edbbcc0da4bd1f556dd98 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 20 Jul 2021 12:28:49 -0700 Subject: [PATCH 041/667] Add (hopefully temporary) workaround for containerd-shim zombies --- 19.03-rc/dind/dockerd-entrypoint.sh | 5 +++++ 19.03/dind/dockerd-entrypoint.sh | 5 +++++ 20.10-rc/dind/dockerd-entrypoint.sh | 5 +++++ 20.10/dind/dockerd-entrypoint.sh | 5 +++++ dockerd-entrypoint.sh | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/19.03-rc/dind/dockerd-entrypoint.sh b/19.03-rc/dind/dockerd-entrypoint.sh index d5f59fa9e..1f5625b57 100755 --- a/19.03-rc/dind/dockerd-entrypoint.sh +++ b/19.03-rc/dind/dockerd-entrypoint.sh @@ -138,6 +138,11 @@ if [ "$1" = 'dockerd' ]; then # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) find /run /var/run -iname 'docker*.pid' -delete || : + if dockerd --version | grep -qF ' 20.10.'; then + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + fi + uid="$(id -u)" if [ "$uid" != '0' ]; then # if we're not root, we must be trying to run rootless diff --git a/19.03/dind/dockerd-entrypoint.sh b/19.03/dind/dockerd-entrypoint.sh index d5f59fa9e..1f5625b57 100755 --- a/19.03/dind/dockerd-entrypoint.sh +++ b/19.03/dind/dockerd-entrypoint.sh @@ -138,6 +138,11 @@ if [ "$1" = 'dockerd' ]; then # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) find /run /var/run -iname 'docker*.pid' -delete || : + if dockerd --version | grep -qF ' 20.10.'; then + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + fi + uid="$(id -u)" if [ "$uid" != '0' ]; then # if we're not root, we must be trying to run rootless diff --git a/20.10-rc/dind/dockerd-entrypoint.sh b/20.10-rc/dind/dockerd-entrypoint.sh index d5f59fa9e..1f5625b57 100755 --- a/20.10-rc/dind/dockerd-entrypoint.sh +++ b/20.10-rc/dind/dockerd-entrypoint.sh @@ -138,6 +138,11 @@ if [ "$1" = 'dockerd' ]; then # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) find /run /var/run -iname 'docker*.pid' -delete || : + if dockerd --version | grep -qF ' 20.10.'; then + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + fi + uid="$(id -u)" if [ "$uid" != '0' ]; then # if we're not root, we must be trying to run rootless diff --git a/20.10/dind/dockerd-entrypoint.sh b/20.10/dind/dockerd-entrypoint.sh index d5f59fa9e..1f5625b57 100755 --- a/20.10/dind/dockerd-entrypoint.sh +++ b/20.10/dind/dockerd-entrypoint.sh @@ -138,6 +138,11 @@ if [ "$1" = 'dockerd' ]; then # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) find /run /var/run -iname 'docker*.pid' -delete || : + if dockerd --version | grep -qF ' 20.10.'; then + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + fi + uid="$(id -u)" if [ "$uid" != '0' ]; then # if we're not root, we must be trying to run rootless diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index d5f59fa9e..1f5625b57 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -138,6 +138,11 @@ if [ "$1" = 'dockerd' ]; then # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) find /run /var/run -iname 'docker*.pid' -delete || : + if dockerd --version | grep -qF ' 20.10.'; then + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + fi + uid="$(id -u)" if [ "$uid" != '0' ]; then # if we're not root, we must be trying to run rootless From 83e4de3bc2aac346e2f76129b1a3a556c1e1bb95 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 3 Aug 2021 22:04:27 -0700 Subject: [PATCH 042/667] Update 20.10 to 20.10.8 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index c56ad6d6e..659d3a63c 100644 --- a/20.10/Dockerfile +++ b/20.10/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 20.10.7 +ENV DOCKER_VERSION 20.10.8 # 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-20.10.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.8.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.8.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.8.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.8.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 117458781..0f5259e9b 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.8.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.8.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 159898e64..84363ce46 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.7 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.7.zip +ENV DOCKER_VERSION 20.10.8 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.8.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/versions.json b/versions.json index b44e72382..47c49df3b 100644 --- a/versions.json +++ b/versions.json @@ -55,21 +55,21 @@ "alpine": "3.13", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.7.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.7.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.8.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.8.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.7.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.8.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.7.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.8.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.7.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.8.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.8.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.7.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.8.zip" } }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", @@ -80,7 +80,7 @@ "git", "windows/windowsservercore-1809" ], - "version": "20.10.7" + "version": "20.10.8" }, "20.10-rc": { "alpine": "3.13", From 75e26edc9ea7fff4aa3212fafa5966f4d6b00022 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 3 Aug 2021 13:17:27 +0200 Subject: [PATCH 043/667] Add libc6-compat as workaround for non-static ctr binary When compiling containerd's ctr on Go 1.15 or up, the produced binary is not fully static, causing it to fail on Alpine: ldd /usr/local/bin/ctr /lib64/ld-linux-x86-64.so.2 (0x7f1970417000) This issue is tracked in https://github.com/containerd/containerd/issues/5824. Until it's fixed, adding `libc6-compat` as a workaround: https://pkgs.alpinelinux.org/package/edge/main/x86_64/libc6-compat Note that there's an alternative `gcompat` package, which provides similar functionality (and also resolves the issue), but unlike `libc6-compat`, that package is a `community` package, is larger, and has more dependencies: https://pkgs.alpinelinux.org/package/edge/community/x86_64/gcompat Signed-off-by: Sebastiaan van Stijn --- 20.10/Dockerfile | 2 ++ Dockerfile.template | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 659d3a63c..a8d787fc9 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -8,6 +8,8 @@ FROM alpine:3.13 RUN apk add --no-cache \ ca-certificates \ +# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 + libc6-compat \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client diff --git a/Dockerfile.template b/Dockerfile.template index 3b7dac846..455227b35 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -2,6 +2,10 @@ FROM alpine:{{ .alpine }} RUN apk add --no-cache \ ca-certificates \ +{{ if ["19.03", "19.03-rc", "20.10-rc"] | index(env.version) | not then ( -}} +# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 + libc6-compat \ +{{ ) else "" end -}} # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client From 461a3ec6ed346995c5949cc2d70c08b9d049caa0 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Thu, 5 Aug 2021 10:04:20 -0700 Subject: [PATCH 044/667] Drop arm32v6 and arm32v7 builds for now --- generate-stackbrew-library.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 58fa4c731..a6fac02de 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -74,6 +74,9 @@ versionArches() { .[env.version].arches | to_entries[] | select(.value.'"$selector"') | .key + # all arm32 builds are broken: + # https://github.com/docker-library/docker/issues/260 + | select(startswith("arm32") | not) ' versions.json | sort ) \ <(xargs -n1 <<<"$parentArches" | sort) From 84749c99aba42d9d4199418842da0c6241ef1841 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 20 Aug 2021 16:10:26 -0700 Subject: [PATCH 045/667] Add suite aliases ("alpine3.13") --- generate-stackbrew-library.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a6fac02de..9489eeb89 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -176,6 +176,14 @@ for version; do variantAliases=( "${versionAliases[@]/%/${variant:+-$variant}}" ) variantAliases=( "${variantAliases[@]//latest-/}" ) + if [[ "$variant" != windowsservercore* ]]; then + parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")" + alpine="${parent#*:}" # "3.14" + suiteAliases=( "${variantAliases[@]/%/-alpine$alpine}" ) + suiteAliases=( "${suiteAliases[@]//latest-/}" ) + variantAliases+=( "${suiteAliases[@]}" ) + fi + sharedTags=() if [[ "$variant" == windowsservercore* ]]; then sharedTags=( "${versionAliases[@]/%/-windowsservercore}" ) From 5307e54fd0d8778994ae6ae91838ecb6c73d6164 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 20 Aug 2021 16:16:20 -0700 Subject: [PATCH 046/667] Limit suite aliases to just the fully-qualified versions (X.Y.Z + X.Y.Z-dind) --- generate-stackbrew-library.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 9489eeb89..8daf7c15e 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -176,10 +176,11 @@ for version; do variantAliases=( "${versionAliases[@]/%/${variant:+-$variant}}" ) variantAliases=( "${variantAliases[@]//latest-/}" ) - if [[ "$variant" != windowsservercore* ]]; then + if [ "$variant" = '' ] || [ "$variant" = 'dind' ]; then parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")" alpine="${parent#*:}" # "3.14" - suiteAliases=( "${variantAliases[@]/%/-alpine$alpine}" ) + suiteAliases=( "${variantAliases[0]}" ) # only "X.Y.Z-foo" + suiteAliases=( "${suiteAliases[@]/%/-alpine$alpine}" ) suiteAliases=( "${suiteAliases[@]//latest-/}" ) variantAliases+=( "${suiteAliases[@]}" ) fi From 3895de50d74a784df7a85c56f51dda04f7071ca1 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 24 Aug 2021 14:44:10 -0700 Subject: [PATCH 047/667] Remove 19.03 (no longer supported / maintained) --- 19.03-rc/Dockerfile | 69 ---------- 19.03-rc/dind-rootless/Dockerfile | 52 -------- 19.03-rc/dind/Dockerfile | 52 -------- 19.03-rc/dind/dockerd-entrypoint.sh | 191 ---------------------------- 19.03-rc/docker-entrypoint.sh | 61 --------- 19.03-rc/git/Dockerfile | 9 -- 19.03-rc/modprobe.sh | 20 --- 19.03/Dockerfile | 69 ---------- 19.03/dind-rootless/Dockerfile | 52 -------- 19.03/dind/Dockerfile | 52 -------- 19.03/dind/dockerd-entrypoint.sh | 191 ---------------------------- 19.03/docker-entrypoint.sh | 61 --------- 19.03/git/Dockerfile | 9 -- 19.03/modprobe.sh | 20 --- 20.10-rc/Dockerfile | 2 + Dockerfile-dind.template | 2 - Dockerfile.template | 2 - generate-stackbrew-library.sh | 5 - versions.json | 52 -------- versions.sh | 5 - 20 files changed, 2 insertions(+), 974 deletions(-) delete mode 100644 19.03-rc/Dockerfile delete mode 100644 19.03-rc/dind-rootless/Dockerfile delete mode 100644 19.03-rc/dind/Dockerfile delete mode 100755 19.03-rc/dind/dockerd-entrypoint.sh delete mode 100755 19.03-rc/docker-entrypoint.sh delete mode 100644 19.03-rc/git/Dockerfile delete mode 100755 19.03-rc/modprobe.sh delete mode 100644 19.03/Dockerfile delete mode 100644 19.03/dind-rootless/Dockerfile delete mode 100644 19.03/dind/Dockerfile delete mode 100755 19.03/dind/dockerd-entrypoint.sh delete mode 100755 19.03/docker-entrypoint.sh delete mode 100644 19.03/git/Dockerfile delete mode 100755 19.03/modprobe.sh diff --git a/19.03-rc/Dockerfile b/19.03-rc/Dockerfile deleted file mode 100644 index 913a8606f..000000000 --- a/19.03-rc/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.13 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client - -# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149 -# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 -# - 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.13-beta2 -# 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) - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-19.03.13-beta2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-19.03.13-beta2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-19.03.13-beta2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-19.03.13-beta2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O docker.tgz "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - docker --version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/19.03-rc/dind-rootless/Dockerfile b/19.03-rc/dind-rootless/Dockerfile deleted file mode 100644 index 8ff3a963a..000000000 --- a/19.03-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -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 -RUN apk add --no-cache iproute2 - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-19.03.13-beta2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O rootless.tgz "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/19.03-rc/dind/Dockerfile b/19.03-rc/dind/Dockerfile deleted file mode 100644 index a67958dc6..000000000 --- a/19.03-rc/dind/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:19.03-rc - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - iptables \ - openssl \ - shadow-uidmap \ - xfsprogs \ - xz \ -# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) - pigz \ - ; \ -# only install zfs if it's available for the current architecture -# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) -# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch - if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ - apk add --no-cache zfs; \ - fi - -# TODO aufs-tools - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/19.03-rc/dind/dockerd-entrypoint.sh b/19.03-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 1f5625b57..000000000 --- a/19.03-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,191 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ - && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ - ; then - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - if dockerd --version | grep -qF ' 20.10.'; then - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - fi - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/19.03-rc/docker-entrypoint.sh b/19.03-rc/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/19.03-rc/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/19.03-rc/git/Dockerfile b/19.03-rc/git/Dockerfile deleted file mode 100644 index 650367c63..000000000 --- a/19.03-rc/git/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:19.03-rc - -RUN apk add --no-cache git diff --git a/19.03-rc/modprobe.sh b/19.03-rc/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/19.03-rc/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/19.03/Dockerfile b/19.03/Dockerfile deleted file mode 100644 index 3cae2ffcd..000000000 --- a/19.03/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.13 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client - -# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149 -# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 -# - 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.15 -# 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) - -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.15.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-19.03.15.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-19.03.15.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O docker.tgz "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - docker --version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/19.03/dind-rootless/Dockerfile b/19.03/dind-rootless/Dockerfile deleted file mode 100644 index b0b542755..000000000 --- a/19.03/dind-rootless/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:19.03-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 -RUN apk add --no-cache iproute2 - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -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.15.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O rootless.tgz "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/19.03/dind/Dockerfile b/19.03/dind/Dockerfile deleted file mode 100644 index bc4c09ca9..000000000 --- a/19.03/dind/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:19.03 - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - iptables \ - openssl \ - shadow-uidmap \ - xfsprogs \ - xz \ -# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) - pigz \ - ; \ -# only install zfs if it's available for the current architecture -# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) -# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch - if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ - apk add --no-cache zfs; \ - fi - -# TODO aufs-tools - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/19.03/dind/dockerd-entrypoint.sh b/19.03/dind/dockerd-entrypoint.sh deleted file mode 100755 index 1f5625b57..000000000 --- a/19.03/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,191 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ - && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ - ; then - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - if dockerd --version | grep -qF ' 20.10.'; then - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - fi - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/19.03/docker-entrypoint.sh b/19.03/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/19.03/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/19.03/git/Dockerfile b/19.03/git/Dockerfile deleted file mode 100644 index 5fa563b1e..000000000 --- a/19.03/git/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:19.03 - -RUN apk add --no-cache git diff --git a/19.03/modprobe.sh b/19.03/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/19.03/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/20.10-rc/Dockerfile b/20.10-rc/Dockerfile index 500381795..d3d6e3878 100644 --- a/20.10-rc/Dockerfile +++ b/20.10-rc/Dockerfile @@ -8,6 +8,8 @@ FROM alpine:3.13 RUN apk add --no-cache \ ca-certificates \ +# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 + libc6-compat \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 6e25a1a9a..668215964 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -6,9 +6,7 @@ RUN set -eux; \ btrfs-progs \ e2fsprogs \ e2fsprogs-extra \ -{{ if ["19.03", "19.03-rc"] | index(env.version) | not then ( -}} ip6tables \ -{{ ) else "" end -}} iptables \ openssl \ shadow-uidmap \ diff --git a/Dockerfile.template b/Dockerfile.template index 455227b35..faf6a46e1 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -2,10 +2,8 @@ FROM alpine:{{ .alpine }} RUN apk add --no-cache \ ca-certificates \ -{{ if ["19.03", "19.03-rc", "20.10-rc"] | index(env.version) | not then ( -}} # Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 libc6-compat \ -{{ ) else "" end -}} # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a6fac02de..a455de099 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -149,13 +149,8 @@ for version; do if [ "$rcVersion" != "$version" ]; then channel='test' fi - if [ -z "${latestChannelRelease[$channel]:-}" ]; then - if [ "$rcVersion" = '19.03' ]; then versionAliases+=( "$channel" ); fi # 19.03 is the last release to include any "channel" aliases - latestChannelRelease[$channel]="$version" - fi # every release goes into the "test" channel, so the biggest numbered release wins (RC or not) if [ -z "${latestChannelRelease['test']:-}" ]; then - if [ "$rcVersion" = '19.03' ]; then versionAliases+=( 'test' ); fi # 19.03 is the last release to include any "channel" aliases latestChannelRelease['test']="$version" fi if [ "$version" = "$rcVersion" ] && [ -z "${latestChannelRelease['latest']:-}" ]; then diff --git a/versions.json b/versions.json index 47c49df3b..a2338e7df 100644 --- a/versions.json +++ b/versions.json @@ -1,56 +1,4 @@ { - "19.03": { - "alpine": "3.13", - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-19.03.15.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.15.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-19.03.15.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-19.03.15.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz" - } - }, - "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", - "variants": [ - "", - "dind", - "dind-rootless", - "git" - ], - "version": "19.03.15" - }, - "19.03-rc": { - "alpine": "3.13", - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-19.03.13-beta2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-19.03.13-beta2.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-19.03.13-beta2.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-19.03.13-beta2.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-19.03.13-beta2.tgz" - } - }, - "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", - "variants": [ - "", - "dind", - "dind-rootless", - "git" - ], - "version": "19.03.13-beta2" - }, "20.10": { "alpine": "3.13", "arches": { diff --git a/versions.sh b/versions.sh index 6118b1d67..957fd0955 100755 --- a/versions.sh +++ b/versions.sh @@ -122,11 +122,6 @@ for version in "${versions[@]}"; do continue # Windows doesn't have rootless extras :) fi - if [ "$rcVersion" = '19.03' ] && [ "$bashbrewArch" != 'amd64' ]; then - # https://github.com/moby/moby/blob/v19.03.15/hack/make/binary-daemon#L24 - # "vpnkit is amd64 only" - continue - fi # https://github.com/moby/moby/blob/v20.10.7/hack/make/binary-daemon#L24 # "vpnkit is available for x86_64 and aarch64" case "$bashbrewArch" in From b207ac5c6eab0a0aafd0e88e864ea6600614ceee Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 14 Jul 2021 14:54:30 +0900 Subject: [PATCH 048/667] update alpine to 3.14 Signed-off-by: Akihiro Suda --- 20.10-rc/Dockerfile | 2 +- 20.10/Dockerfile | 2 +- versions.json | 4 ++-- versions.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/20.10-rc/Dockerfile b/20.10-rc/Dockerfile index d3d6e3878..5873f4754 100644 --- a/20.10-rc/Dockerfile +++ b/20.10-rc/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.13 +FROM alpine:3.14 RUN apk add --no-cache \ ca-certificates \ diff --git a/20.10/Dockerfile b/20.10/Dockerfile index a8d787fc9..17cbdec5e 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.13 +FROM alpine:3.14 RUN apk add --no-cache \ ca-certificates \ diff --git a/versions.json b/versions.json index a2338e7df..ce7b93ba4 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "20.10": { - "alpine": "3.13", + "alpine": "3.14", "arches": { "amd64": { "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.8.tgz", @@ -31,7 +31,7 @@ "version": "20.10.8" }, "20.10-rc": { - "alpine": "3.13", + "alpine": "3.14", "arches": { "amd64": { "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-rc2.tgz", diff --git a/versions.sh b/versions.sh index 957fd0955..93891e50e 100755 --- a/versions.sh +++ b/versions.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -Eeuo pipefail -defaultAlpineVersion='3.13' +defaultAlpineVersion='3.14' declare -A alpineVersion=( #[17.09]='3.6' ) From e129c04f3eef8d3934e455fa1f56f4407b2c88de Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 22 Sep 2021 17:06:01 -0700 Subject: [PATCH 049/667] Exclude RCs more explicitly when they do not apply --- 20.10-rc/Dockerfile | 71 ----------- 20.10-rc/dind-rootless/Dockerfile | 55 -------- 20.10-rc/dind/Dockerfile | 53 -------- 20.10-rc/dind/dockerd-entrypoint.sh | 191 ---------------------------- 20.10-rc/docker-entrypoint.sh | 61 --------- 20.10-rc/git/Dockerfile | 9 -- 20.10-rc/modprobe.sh | 20 --- apply-templates.sh | 6 + generate-stackbrew-library.sh | 26 ++-- versions.json | 28 +--- versions.sh | 26 +++- 11 files changed, 37 insertions(+), 509 deletions(-) delete mode 100644 20.10-rc/Dockerfile delete mode 100644 20.10-rc/dind-rootless/Dockerfile delete mode 100644 20.10-rc/dind/Dockerfile delete mode 100755 20.10-rc/dind/dockerd-entrypoint.sh delete mode 100755 20.10-rc/docker-entrypoint.sh delete mode 100644 20.10-rc/git/Dockerfile delete mode 100755 20.10-rc/modprobe.sh diff --git a/20.10-rc/Dockerfile b/20.10-rc/Dockerfile deleted file mode 100644 index 5873f4754..000000000 --- a/20.10-rc/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.14 - -RUN apk add --no-cache \ - ca-certificates \ -# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 - libc6-compat \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client - -# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149 -# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 -# - 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 20.10.0-rc2 -# 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) - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-rc2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-20.10.0-rc2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-20.10.0-rc2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O docker.tgz "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - docker --version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/20.10-rc/dind-rootless/Dockerfile b/20.10-rc/dind-rootless/Dockerfile deleted file mode 100644 index 42bd38123..000000000 --- a/20.10-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:20.10-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 -RUN apk add --no-cache iproute2 - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-rc2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-20.10.0-rc2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O rootless.tgz "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/20.10-rc/dind/Dockerfile b/20.10-rc/dind/Dockerfile deleted file mode 100644 index 98a14e0c3..000000000 --- a/20.10-rc/dind/Dockerfile +++ /dev/null @@ -1,53 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:20.10-rc - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - ip6tables \ - iptables \ - openssl \ - shadow-uidmap \ - xfsprogs \ - xz \ -# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) - pigz \ - ; \ -# only install zfs if it's available for the current architecture -# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) -# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch - if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ - apk add --no-cache zfs; \ - fi - -# TODO aufs-tools - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/20.10-rc/dind/dockerd-entrypoint.sh b/20.10-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 1f5625b57..000000000 --- a/20.10-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,191 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ - && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ - ; then - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - if dockerd --version | grep -qF ' 20.10.'; then - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - fi - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/20.10-rc/docker-entrypoint.sh b/20.10-rc/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/20.10-rc/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/20.10-rc/git/Dockerfile b/20.10-rc/git/Dockerfile deleted file mode 100644 index 11f2c2eed..000000000 --- a/20.10-rc/git/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:20.10-rc - -RUN apk add --no-cache git diff --git a/20.10-rc/modprobe.sh b/20.10-rc/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/20.10-rc/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/apply-templates.sh b/apply-templates.sh index ca7de349e..d065f1a73 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -29,6 +29,12 @@ generated_warning() { for version; do export version + if jq -e '.[env.version] | not' versions.json > /dev/null; then + echo "deleting $version ..." + rm -rf "$version" + continue + fi + variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)" eval "variants=( $variants )" diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a65ade723..a205d0eb0 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -5,7 +5,14 @@ self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" if [ "$#" -eq 0 ]; then - versions="$(jq -r 'keys | map(@sh) | join(" ")' versions.json)" + versions="$(jq -r ' + to_entries + # sort version numbers with highest first + | sort_by(.key | split("[.-]"; "") | map(try tonumber // .)) + | reverse + | map(if .value then .key | @sh else empty end) + | join(" ") + ' versions.json)" eval "set -- $versions" fi @@ -82,9 +89,6 @@ versionArches() { <(xargs -n1 <<<"$parentArches" | sort) } -# sort version numbers with highest first -IFS=$'\n'; set -- $(sort -rV <<<"$*"); unset IFS - cat <<-EOH # this file is generated via https://github.com/docker-library/docker/blob/$(fileCommit "$self")/$self @@ -108,17 +112,9 @@ for version; do export version rcVersion="${version%-rc}" - fullVersion="$(jq -r '.[env.version].version' versions.json)" - - if [ "$rcVersion" != "$version" ] && [ -e "$rcVersion/Dockerfile" ]; then - # if this is a "-rc" release, let's make sure the release it contains isn't already GA (and thus something we should not publish anymore) - export rcVersion - rcFullVersion="$(jq -r '.[env.rcVersion].version' versions.json)" - latestVersion="$({ echo "$fullVersion"; echo "$rcFullVersion"; } | sort -V | tail -1)" - if [[ "$fullVersion" == "$rcFullVersion"* ]] || [ "$latestVersion" = "$rcFullVersion" ]; then - # "x.y.z-rc1" == x.y.z* - continue - fi + if ! fullVersion="$(jq -er '.[env.version] | if . then .version else empty end' versions.json)"; then + # support running "generate-stackbrew-library.sh" on a singular "null" version ("20.10-rc" when the RC is older than the GA release, for example) + continue fi versionAliases=() diff --git a/versions.json b/versions.json index ce7b93ba4..141ae28f3 100644 --- a/versions.json +++ b/versions.json @@ -30,31 +30,5 @@ ], "version": "20.10.8" }, - "20.10-rc": { - "alpine": "3.14", - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-20.10.0-rc2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.0-rc2.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-20.10.0-rc2.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-20.10.0-rc2.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.0-rc2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-20.10.0-rc2.tgz" - } - }, - "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", - "variants": [ - "", - "dind", - "dind-rootless", - "git" - ], - "version": "20.10.0-rc2" - } + "20.10-rc": null } diff --git a/versions.sh b/versions.sh index 93891e50e..862e5e2a7 100755 --- a/versions.sh +++ b/versions.sh @@ -1,9 +1,8 @@ #!/usr/bin/env bash set -Eeuo pipefail -defaultAlpineVersion='3.14' declare -A alpineVersion=( - #[17.09]='3.6' + [20.10]='3.14' ) # bashbrew arch to docker-release-arch @@ -21,7 +20,9 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" versions=( "$@" ) if [ ${#versions[@]} -eq 0 ]; then - versions=( */ ) + versions=( "${!alpineVersion[@]}" ) + # try RC releases after doing the non-RCs so we can check whether they're newer (and thus whether we should care) + versions+=( "${versions[@]/%/-rc}" ) json='{}' else json="$(< versions.json)" @@ -70,7 +71,7 @@ dockerVersions="$( for version in "${versions[@]}"; do rcVersion="${version%-rc}" channel='stable' - alpine="${alpineVersion[$version]:-$defaultAlpineVersion}" + alpine="${alpineVersion[$rcVersion]}" versionOptions="$(grep "^$rcVersion[.]" <<<"$dockerVersions")" @@ -82,8 +83,20 @@ for version in "${versions[@]}"; do fullVersion="$(grep $rcGrepV -E -- '-(rc|tp|beta)' <<<"$versionOptions" | tail -1)" if [ -z "$fullVersion" ]; then - echo >&2 "warning: cannot find full version for $version" - continue + echo >&2 "error: cannot find full version for $version" + exit 1 + fi + + # if this is a "-rc" release, let's make sure the release it contains isn't already GA (and thus something we should not publish anymore) + export version rcVersion + if [ "$rcVersion" != "$version" ] && rcFullVersion="$(jq <<<"$json" -r '.[env.rcVersion].version // ""')" && [ -n "$rcFullVersion" ]; then + latestVersion="$({ echo "$fullVersion"; echo "$rcFullVersion"; } | sort -V | tail -1)" + if [[ "$fullVersion" == "$rcFullVersion"* ]] || [ "$latestVersion" = "$rcFullVersion" ]; then + # "x.y.z-rc1" == x.y.z* + echo >&2 "warning: skipping/removing '$version' ('$rcVersion' is at '$rcFullVersion' which is newer than '$fullVersion')" + json="$(jq <<<"$json" -c '.[env.version] = null')" + continue + fi fi echo "$version: $fullVersion" @@ -154,7 +167,6 @@ for version in "${versions[@]}"; do doc="$(jq <<<"$doc" -c '.variants += [ env.variant ]')" done - export version json="$(jq <<<"$json" -c --argjson doc "$doc" '.[env.version] = $doc')" done From 8b8d62e7eb791b060cc75cb2956724a1bdc5484b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 4 Oct 2021 11:41:18 -0700 Subject: [PATCH 050/667] Update 20.10 to 20.10.9 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 17cbdec5e..4eb66cc9e 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -19,7 +19,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 20.10.8 +ENV DOCKER_VERSION 20.10.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) @@ -29,16 +29,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.9.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.9.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 0f5259e9b..c3e13b5a3 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.9.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.9.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 84363ce46..7acbedb41 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.8 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.8.zip +ENV DOCKER_VERSION 20.10.9 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.9.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/versions.json b/versions.json index 141ae28f3..346ca304c 100644 --- a/versions.json +++ b/versions.json @@ -3,21 +3,21 @@ "alpine": "3.14", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.8.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.8.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.9.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.8.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.9.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.8.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.9.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.8.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.8.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.9.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.8.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.9.zip" } }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", @@ -28,7 +28,7 @@ "git", "windows/windowsservercore-1809" ], - "version": "20.10.8" + "version": "20.10.9" }, "20.10-rc": null } From 8357440cbda8dfac788886be6fa07cea0970c731 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 18 Oct 2021 13:11:42 -0700 Subject: [PATCH 051/667] Fix minor oversight --- versions.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/versions.sh b/versions.sh index 862e5e2a7..795be328a 100755 --- a/versions.sh +++ b/versions.sh @@ -159,7 +159,6 @@ for version in "${versions[@]}"; do windows/windowsservercore-1809 \ ; do base="${variant%%/*}" # "buster", "windows", etc. - [ -d "$version/$base" ] || continue if [ "$base" = 'windows' ] && [ -z "$hasWindows" ]; then continue fi From f76814e807ad2d9d76b0ec50ec8e623a5fdb72e7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 18 Oct 2021 13:12:12 -0700 Subject: [PATCH 052/667] Update 20.10-rc to 20.10.10-rc1 --- 20.10-rc/Dockerfile | 71 +++++++ 20.10-rc/dind-rootless/Dockerfile | 55 +++++ 20.10-rc/dind/Dockerfile | 53 +++++ 20.10-rc/dind/dockerd-entrypoint.sh | 191 ++++++++++++++++++ 20.10-rc/docker-entrypoint.sh | 61 ++++++ 20.10-rc/git/Dockerfile | 9 + 20.10-rc/modprobe.sh | 20 ++ .../windows/windowsservercore-1809/Dockerfile | 40 ++++ versions.json | 32 ++- 9 files changed, 531 insertions(+), 1 deletion(-) create mode 100644 20.10-rc/Dockerfile create mode 100644 20.10-rc/dind-rootless/Dockerfile create mode 100644 20.10-rc/dind/Dockerfile create mode 100755 20.10-rc/dind/dockerd-entrypoint.sh create mode 100755 20.10-rc/docker-entrypoint.sh create mode 100644 20.10-rc/git/Dockerfile create mode 100755 20.10-rc/modprobe.sh create mode 100644 20.10-rc/windows/windowsservercore-1809/Dockerfile diff --git a/20.10-rc/Dockerfile b/20.10-rc/Dockerfile new file mode 100644 index 000000000..4a2f38d3e --- /dev/null +++ b/20.10-rc/Dockerfile @@ -0,0 +1,71 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.14 + +RUN apk add --no-cache \ + ca-certificates \ +# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 + libc6-compat \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149 +# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 +# - 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 20.10.10-rc1 +# 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) + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-20.10.10-rc1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-20.10.10-rc1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-20.10.10-rc1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-20.10.10-rc1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O docker.tgz "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + docker --version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/20.10-rc/dind-rootless/Dockerfile b/20.10-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..ff837c896 --- /dev/null +++ b/20.10-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:20.10-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 +RUN apk add --no-cache iproute2 + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.10-rc1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-20.10.10-rc1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O rootless.tgz "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/20.10-rc/dind/Dockerfile b/20.10-rc/dind/Dockerfile new file mode 100644 index 000000000..98a14e0c3 --- /dev/null +++ b/20.10-rc/dind/Dockerfile @@ -0,0 +1,53 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:20.10-rc + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + ip6tables \ + iptables \ + openssl \ + shadow-uidmap \ + xfsprogs \ + xz \ +# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) + pigz \ + ; \ +# only install zfs if it's available for the current architecture +# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) +# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch + if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ + apk add --no-cache zfs; \ + fi + +# TODO aufs-tools + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/20.10-rc/dind/dockerd-entrypoint.sh b/20.10-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..1f5625b57 --- /dev/null +++ b/20.10-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,191 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ + && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ + ; then + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + if dockerd --version | grep -qF ' 20.10.'; then + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + fi + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/20.10-rc/docker-entrypoint.sh b/20.10-rc/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/20.10-rc/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/20.10-rc/git/Dockerfile b/20.10-rc/git/Dockerfile new file mode 100644 index 000000000..11f2c2eed --- /dev/null +++ b/20.10-rc/git/Dockerfile @@ -0,0 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:20.10-rc + +RUN apk add --no-cache git diff --git a/20.10-rc/modprobe.sh b/20.10-rc/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/20.10-rc/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/20.10-rc/windows/windowsservercore-1809/Dockerfile b/20.10-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..bfb450508 --- /dev/null +++ b/20.10-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,40 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 20.10.10-rc1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-20.10.10-rc1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 346ca304c..66fef7490 100644 --- a/versions.json +++ b/versions.json @@ -30,5 +30,35 @@ ], "version": "20.10.9" }, - "20.10-rc": null + "20.10-rc": { + "alpine": "3.14", + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-20.10.10-rc1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.10-rc1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-20.10.10-rc1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-20.10.10-rc1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.10-rc1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-20.10.10-rc1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-20.10.10-rc1.zip" + } + }, + "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", + "variants": [ + "", + "dind", + "dind-rootless", + "git", + "windows/windowsservercore-1809" + ], + "version": "20.10.10-rc1" + } } From 59df8d0091036d190e92334f3fd8ccaee3bafa0b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 25 Oct 2021 11:01:12 -0700 Subject: [PATCH 053/667] Update 20.10 to 20.10.10 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 4eb66cc9e..1d2974ca6 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -19,7 +19,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 20.10.9 +ENV DOCKER_VERSION 20.10.10 # 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) @@ -29,16 +29,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.10.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.9.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.10.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.9.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.10.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.10.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index c3e13b5a3..640e4cbc2 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.9.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.10.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.9.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.10.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 7acbedb41..9a1102824 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.9 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.9.zip +ENV DOCKER_VERSION 20.10.10 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.10.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/versions.json b/versions.json index 66fef7490..afd0ca0cd 100644 --- a/versions.json +++ b/versions.json @@ -3,21 +3,21 @@ "alpine": "3.14", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.9.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.10.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.10.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.9.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.10.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.9.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.10.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.9.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.9.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.10.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.10.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.9.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.10.zip" } }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", @@ -28,7 +28,7 @@ "git", "windows/windowsservercore-1809" ], - "version": "20.10.9" + "version": "20.10.10" }, "20.10-rc": { "alpine": "3.14", From 8726cfb3fd792c69b0cb6e2d5d9c02dda68051bf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 25 Oct 2021 11:03:30 -0700 Subject: [PATCH 054/667] Update 20.10-rc --- 20.10-rc/Dockerfile | 71 ------- 20.10-rc/dind-rootless/Dockerfile | 55 ----- 20.10-rc/dind/Dockerfile | 53 ----- 20.10-rc/dind/dockerd-entrypoint.sh | 191 ------------------ 20.10-rc/docker-entrypoint.sh | 61 ------ 20.10-rc/git/Dockerfile | 9 - 20.10-rc/modprobe.sh | 20 -- .../windows/windowsservercore-1809/Dockerfile | 40 ---- versions.json | 32 +-- 9 files changed, 1 insertion(+), 531 deletions(-) delete mode 100644 20.10-rc/Dockerfile delete mode 100644 20.10-rc/dind-rootless/Dockerfile delete mode 100644 20.10-rc/dind/Dockerfile delete mode 100755 20.10-rc/dind/dockerd-entrypoint.sh delete mode 100755 20.10-rc/docker-entrypoint.sh delete mode 100644 20.10-rc/git/Dockerfile delete mode 100755 20.10-rc/modprobe.sh delete mode 100644 20.10-rc/windows/windowsservercore-1809/Dockerfile diff --git a/20.10-rc/Dockerfile b/20.10-rc/Dockerfile deleted file mode 100644 index 4a2f38d3e..000000000 --- a/20.10-rc/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.14 - -RUN apk add --no-cache \ - ca-certificates \ -# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 - libc6-compat \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client - -# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149 -# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 -# - 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 20.10.10-rc1 -# 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) - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-20.10.10-rc1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-20.10.10-rc1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-20.10.10-rc1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-20.10.10-rc1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O docker.tgz "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - docker --version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/20.10-rc/dind-rootless/Dockerfile b/20.10-rc/dind-rootless/Dockerfile deleted file mode 100644 index ff837c896..000000000 --- a/20.10-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:20.10-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 -RUN apk add --no-cache iproute2 - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.10-rc1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-20.10.10-rc1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O rootless.tgz "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/20.10-rc/dind/Dockerfile b/20.10-rc/dind/Dockerfile deleted file mode 100644 index 98a14e0c3..000000000 --- a/20.10-rc/dind/Dockerfile +++ /dev/null @@ -1,53 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:20.10-rc - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - ip6tables \ - iptables \ - openssl \ - shadow-uidmap \ - xfsprogs \ - xz \ -# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) - pigz \ - ; \ -# only install zfs if it's available for the current architecture -# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) -# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch - if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ - apk add --no-cache zfs; \ - fi - -# TODO aufs-tools - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/20.10-rc/dind/dockerd-entrypoint.sh b/20.10-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 1f5625b57..000000000 --- a/20.10-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,191 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ - && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ - ; then - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - if dockerd --version | grep -qF ' 20.10.'; then - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - fi - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/20.10-rc/docker-entrypoint.sh b/20.10-rc/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/20.10-rc/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/20.10-rc/git/Dockerfile b/20.10-rc/git/Dockerfile deleted file mode 100644 index 11f2c2eed..000000000 --- a/20.10-rc/git/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:20.10-rc - -RUN apk add --no-cache git diff --git a/20.10-rc/modprobe.sh b/20.10-rc/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/20.10-rc/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/20.10-rc/windows/windowsservercore-1809/Dockerfile b/20.10-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index bfb450508..000000000 --- a/20.10-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 20.10.10-rc1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-20.10.10-rc1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index afd0ca0cd..c3e82e0e7 100644 --- a/versions.json +++ b/versions.json @@ -30,35 +30,5 @@ ], "version": "20.10.10" }, - "20.10-rc": { - "alpine": "3.14", - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-20.10.10-rc1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-20.10.10-rc1.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-20.10.10-rc1.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-20.10.10-rc1.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-20.10.10-rc1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-20.10.10-rc1.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-20.10.10-rc1.zip" - } - }, - "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", - "variants": [ - "", - "dind", - "dind-rootless", - "git", - "windows/windowsservercore-1809" - ], - "version": "20.10.10-rc1" - } + "20.10-rc": null } From 5c42a7382f317ef94c16eb264ff9337ef4b9a260 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Nov 2021 18:59:29 -0800 Subject: [PATCH 055/667] Update 20.10 to 20.10.11 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 1d2974ca6..e087881c8 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -19,7 +19,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 20.10.10 +ENV DOCKER_VERSION 20.10.11 # 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) @@ -29,16 +29,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.10.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.11.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.10.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.11.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.10.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.11.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.10.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 640e4cbc2..b8d415f96 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.10.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.11.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.10.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.11.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 9a1102824..5b077a80c 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.10 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.10.zip +ENV DOCKER_VERSION 20.10.11 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.11.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/versions.json b/versions.json index c3e82e0e7..465cf861a 100644 --- a/versions.json +++ b/versions.json @@ -3,21 +3,21 @@ "alpine": "3.14", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.10.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.10.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.11.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.11.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.10.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.11.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.10.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.11.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.10.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.10.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.11.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.10.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.11.zip" } }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", @@ -28,7 +28,7 @@ "git", "windows/windowsservercore-1809" ], - "version": "20.10.10" + "version": "20.10.11" }, "20.10-rc": null } From 16d77b9b3258873b79b8c997d5e2b90c5533b85e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 13 Dec 2021 10:04:16 -0800 Subject: [PATCH 056/667] Update 20.10 to 20.10.12 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index e087881c8..5140eb982 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -19,7 +19,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 20.10.11 +ENV DOCKER_VERSION 20.10.12 # 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) @@ -29,16 +29,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.11.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.12.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.11.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.12.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.11.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.12.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.12.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index b8d415f96..dff1b2f7e 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.11.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.12.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.11.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.12.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 5b077a80c..4d2fad672 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.11 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.11.zip +ENV DOCKER_VERSION 20.10.12 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.12.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/versions.json b/versions.json index 465cf861a..a10ef49e0 100644 --- a/versions.json +++ b/versions.json @@ -3,21 +3,21 @@ "alpine": "3.14", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.11.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.11.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.12.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.12.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.11.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.12.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.11.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.12.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.11.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.11.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.12.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.12.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.11.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.12.zip" } }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", @@ -28,7 +28,7 @@ "git", "windows/windowsservercore-1809" ], - "version": "20.10.11" + "version": "20.10.12" }, "20.10-rc": null } From fcbca72b6fa10cc329b70f964409f520d8fa73b8 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Wed, 15 Dec 2021 14:43:43 +0800 Subject: [PATCH 057/667] update alpine to 3.15 Signed-off-by: Jintao Zhang --- 20.10/Dockerfile | 2 +- versions.json | 2 +- versions.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 5140eb982..57b451863 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.14 +FROM alpine:3.15 RUN apk add --no-cache \ ca-certificates \ diff --git a/versions.json b/versions.json index a10ef49e0..3266d2768 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "20.10": { - "alpine": "3.14", + "alpine": "3.15", "arches": { "amd64": { "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.12.tgz", diff --git a/versions.sh b/versions.sh index 795be328a..9fc4faf1b 100755 --- a/versions.sh +++ b/versions.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail declare -A alpineVersion=( - [20.10]='3.14' + [20.10]='3.15' ) # bashbrew arch to docker-release-arch From 0df35a84de9c27430c1bcc06b0b476223a15d408 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 7 Jan 2022 11:55:05 -0800 Subject: [PATCH 058/667] Add Windows Server LTSC 2022 --- .../windowsservercore-ltsc2022/Dockerfile | 40 +++++++++++++++++++ versions.json | 1 + versions.sh | 1 + 3 files changed, 42 insertions(+) create mode 100644 20.10/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..b0f7f3f2d --- /dev/null +++ b/20.10/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,40 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 20.10.12 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.12.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 3266d2768..92de92a6f 100644 --- a/versions.json +++ b/versions.json @@ -26,6 +26,7 @@ "dind", "dind-rootless", "git", + "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], "version": "20.10.12" diff --git a/versions.sh b/versions.sh index 9fc4faf1b..37589b247 100755 --- a/versions.sh +++ b/versions.sh @@ -156,6 +156,7 @@ for version in "${versions[@]}"; do dind \ dind-rootless \ git \ + windows/windowsservercore-ltsc2022 \ windows/windowsservercore-1809 \ ; do base="${variant%%/*}" # "buster", "windows", etc. From 447276895e5d3051ab891fcfb32254c0eb0d36de Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 12 Jan 2022 13:43:08 -0800 Subject: [PATCH 059/667] Remove reference to ltsc2016 variants (EOL) See https://docs.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/base-image-lifecycle and https://github.com/docker-library/official-images/pull/11661 --- apply-templates.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apply-templates.sh b/apply-templates.sh index d065f1a73..43970ff7f 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -45,7 +45,7 @@ for version; do windows/*) variant="$(basename "$variant")" # "windowsservercore-1809", etc windowsVariant="${variant%%-*}" # "windowsservercore", "nanoserver" - windowsRelease="${variant#$windowsVariant-}" # "1809", "ltsc2016", etc + windowsRelease="${variant#$windowsVariant-}" # "ltsc2022", "1809", etc windowsVariant="${windowsVariant#windows}" # "servercore", "nanoserver" export windowsVariant windowsRelease template="Dockerfile-windows-$windowsVariant.template" From 0efba9e3cd4537de89ba54de2ad8acc5e3b1759f Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 20 Jan 2022 12:25:25 -0800 Subject: [PATCH 060/667] Invoke "modprobe ip_tables" if "iptables -L" fails --- 20.10/dind/dockerd-entrypoint.sh | 7 +++++++ dockerd-entrypoint.sh | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/20.10/dind/dockerd-entrypoint.sh b/20.10/dind/dockerd-entrypoint.sh index 1f5625b57..38bc26293 100755 --- a/20.10/dind/dockerd-entrypoint.sh +++ b/20.10/dind/dockerd-entrypoint.sh @@ -143,6 +143,13 @@ if [ "$1" = 'dockerd' ]; then set -- docker-init -- "$@" fi + if ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + modprobe ip_tables || : + fi + uid="$(id -u)" if [ "$uid" != '0' ]; then # if we're not root, we must be trying to run rootless diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 1f5625b57..38bc26293 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -143,6 +143,13 @@ if [ "$1" = 'dockerd' ]; then set -- docker-init -- "$@" fi + if ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + modprobe ip_tables || : + fi + uid="$(id -u)" if [ "$uid" != '0' ]; then # if we're not root, we must be trying to run rootless From 39b574a3813ec7c3f82157639f03b7c2af925bb4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 10 Mar 2022 10:04:16 -0800 Subject: [PATCH 061/667] Update 20.10 to 20.10.13 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 57b451863..91d1ed92b 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -19,7 +19,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 20.10.12 +ENV DOCKER_VERSION 20.10.13 # 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) @@ -29,16 +29,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.12.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.13.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.12.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.13.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.12.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.13.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.12.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index dff1b2f7e..a946dcc32 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.12.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.13.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.12.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.13.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 4d2fad672..a6c15753e 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.12 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.12.zip +ENV DOCKER_VERSION 20.10.13 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.13.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index b0f7f3f2d..08797db94 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.12 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.12.zip +ENV DOCKER_VERSION 20.10.13 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.13.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/versions.json b/versions.json index 92de92a6f..80632d5b9 100644 --- a/versions.json +++ b/versions.json @@ -3,21 +3,21 @@ "alpine": "3.15", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.12.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.12.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.13.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.13.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.12.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.13.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.12.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.13.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.12.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.12.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.13.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.12.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.13.zip" } }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", @@ -29,7 +29,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.12" + "version": "20.10.13" }, "20.10-rc": null } From 4c51639763865cc04cff127ea50e96ff377b6723 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 23 Mar 2022 20:46:53 -0700 Subject: [PATCH 062/667] Update 20.10 to 20.10.14 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 91d1ed92b..ef88078c1 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -19,7 +19,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 20.10.13 +ENV DOCKER_VERSION 20.10.14 # 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) @@ -29,16 +29,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.13.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.14.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.13.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.14.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.13.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.14.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.14.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index a946dcc32..f4c03e3a7 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.13.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.14.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.13.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.14.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index a6c15753e..fda473377 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.13 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.13.zip +ENV DOCKER_VERSION 20.10.14 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.14.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index 08797db94..37d281803 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.13 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.13.zip +ENV DOCKER_VERSION 20.10.14 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.14.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/versions.json b/versions.json index 80632d5b9..b5e5fdbbf 100644 --- a/versions.json +++ b/versions.json @@ -3,21 +3,21 @@ "alpine": "3.15", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.13.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.13.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.14.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.14.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.13.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.14.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.13.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.14.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.13.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.13.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.14.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.14.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.13.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.14.zip" } }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", @@ -29,7 +29,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.13" + "version": "20.10.14" }, "20.10-rc": null } From 51f3e36ac5300d2e8734d2995d600ca4681d5c38 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 5 May 2022 15:45:32 -0700 Subject: [PATCH 063/667] Update 20.10 to 20.10.15 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index ef88078c1..1bfb8f347 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -19,7 +19,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 20.10.14 +ENV DOCKER_VERSION 20.10.15 # 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) @@ -29,16 +29,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.14.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.15.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.14.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.15.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.14.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.15.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.14.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.15.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index f4c03e3a7..020817c81 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.14.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.15.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.14.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.15.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index fda473377..7b0b63725 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.14 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.14.zip +ENV DOCKER_VERSION 20.10.15 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.15.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index 37d281803..997218a7c 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.14 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.14.zip +ENV DOCKER_VERSION 20.10.15 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.15.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/versions.json b/versions.json index b5e5fdbbf..ebd98b2a0 100644 --- a/versions.json +++ b/versions.json @@ -3,21 +3,21 @@ "alpine": "3.15", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.14.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.14.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.15.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.15.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.14.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.15.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.14.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.15.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.14.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.14.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.15.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.15.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.14.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.15.zip" } }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", @@ -29,7 +29,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.14" + "version": "20.10.15" }, "20.10-rc": null } From 9aaa75893c70431f1302b0608af47ee26d67edf2 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 6 May 2022 16:05:42 -0700 Subject: [PATCH 064/667] Add "buildx" and "compose" CLI plugins (for supported architectures of each) --- 20.10/Dockerfile | 80 +++++++++++++++++++++++++++++++++ Dockerfile.template | 74 ++++++++++++++++++++++++++----- versions.json | 100 +++++++++++++++++++++++++++++++++++++++++ versions.sh | 106 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 348 insertions(+), 12 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 1bfb8f347..2834fda7e 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -55,6 +55,86 @@ RUN set -eux; \ dockerd --version; \ docker --version +ENV DOCKER_BUILDX_VERSION 0.8.2 +RUN set -eux; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64'; \ + sha256='c64de4f3c30f7a73ff9db637660c7aa0f00234368105b0a09fa8e24eebe910c3'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v6'; \ + sha256='d0e5d19cd67ea7a351e3bfe1de96f3d583a5b80f1bbadd61f7adcd61b147e5f5'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v7'; \ + sha256='b5bb1e28e9413a75b2600955c486870aafd234f69953601eecc3664bd3af7463'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm64'; \ + sha256='304d3d9822c75f98ad9cf57f0c234bcf326bbb96d791d551728cadd72a7a377f'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-ppc64le'; \ + sha256='32b317d86c700d920468f162f93ae2282777da556ee49b4329f6c72ee2b11b85'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-riscv64'; \ + sha256='76d5fcf92ffa31b3e470d8ec1ab11f7b6997729e5c94d543fec765ad79ad0630'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x'; \ + sha256='ec4bb6f271f38dca5a377a70be24ee2108a85f6e6ba511ad3b805c4f1602a0d2'; \ + ;; \ + *) echo >&2 "warning: unsupported buildx architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + plugin='/usr/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + wget -O "$plugin" "$url"; \ + echo "$sha256 *$plugin" | sha256sum -c -; \ + chmod +x "$plugin"; \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.5.0 +RUN set -eux; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-x86_64'; \ + sha256='6296d17268c77a7159f57f04ed26dd2989f909c58cca4d44d1865f28bd27dd67'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-armv6'; \ + sha256='92b423e2c4d0ca0a979d7b6a4fb13707612f8fa19b900bc6cd1c2cf83f2780c5'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-armv7'; \ + sha256='d728dcbe5e20103e9b025efdbb6bfbca9ea9866851e669f7775fe3ebb7ab945c'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-aarch64'; \ + sha256='7efc61cc85fe712f14f04a6886d1481c96fe958be265f67482583b4b713b6a22'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-ppc64le'; \ + sha256='e40af00a5f3ef87d31372f949134411b574042b8c055b2e5da12b92192405cb6'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-s390x'; \ + sha256='c36e48910f095d07d582b69363fb3f902bb6fab9e2bd3d5ed82a67d1b2279a39'; \ + ;; \ + *) echo >&2 "warning: unsupported compose architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + plugin='/usr/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + wget -O "$plugin" "$url"; \ + echo "$sha256 *$plugin" | sha256sum -c -; \ + chmod +x "$plugin"; \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + COPY modprobe.sh /usr/local/bin/modprobe COPY docker-entrypoint.sh /usr/local/bin/ diff --git a/Dockerfile.template b/Dockerfile.template index faf6a46e1..67084c2e9 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -18,6 +18,22 @@ ENV DOCKER_VERSION {{ .version }} # 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) +{{ + def apkArch: + { + # https://dl-cdn.alpinelinux.org/alpine/edge/main/ + # https://wiki.alpinelinux.org/wiki/Architecture#Alpine_Hardware_Architecture_.28.22arch.22.29_Support + # https://pkgs.alpinelinux.org/packages ("Arch" dropdown) + amd64: "x86_64", + arm32v6: "armhf", + arm32v7: "armv7", + arm64v8: "aarch64", + i386: "x86", + ppc64le: "ppc64le", + riscv64: "riscv64", + s390x: "s390x", + }[.] +-}} RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ @@ -25,18 +41,10 @@ RUN set -eux; \ {{ [ .arches | to_entries[] - | select(.value.dockerUrl and (.key | startswith("windows-") | not)) | .key as $bashbrewArch - | ( - { - amd64: "x86_64", - arm32v6: "armhf", - arm32v7: "armv7", - arm64v8: "aarch64", - } - | .[$bashbrewArch] // $bashbrewArch - ) as $apkArch + | ($bashbrewArch | apkArch) as $apkArch | .value + | select($apkArch and .dockerUrl) | ( -}} {{ $apkArch | @sh }}) \ @@ -60,6 +68,52 @@ RUN set -eux; \ \ dockerd --version; \ docker --version +{{ + { + buildx: .buildx, + compose: .compose, + } + | to_entries | map( + .key as $key | .value | ( +-}} + +ENV DOCKER_{{ $key | ascii_upcase }}_VERSION {{ .version }} +RUN set -eux; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ +{{ + .arches | to_entries | map( + .key as $bashbrewArch + | ($bashbrewArch | apkArch) as $apkArch + | .value + | select($apkArch and .url and .sha256) + | ( +-}} + {{ $apkArch | @sh }}) \ + url={{ .url | @sh }}; \ + sha256={{ .sha256 | @sh }}; \ + ;; \ +{{ + ) + ) | add +-}} + *) echo >&2 "warning: unsupported {{ $key }} architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + plugin='/usr/libexec/docker/cli-plugins/docker-{{ $key }}'; \ + mkdir -p "$(dirname "$plugin")"; \ + wget -O "$plugin" "$url"; \ + echo "$sha256 *$plugin" | sha256sum -c -; \ + chmod +x "$plugin"; \ +{{ if $key == "compose" then ( -}} + ln -sv "$plugin" /usr/local/bin/; \ + docker-{{ $key }} --version; \ +{{ ) else "" end -}} + docker {{ $key }} version +{{ + ) + ) + | add +-}} COPY modprobe.sh /usr/local/bin/modprobe COPY docker-entrypoint.sh /usr/local/bin/ diff --git a/versions.json b/versions.json index ebd98b2a0..14fe361ce 100644 --- a/versions.json +++ b/versions.json @@ -20,6 +20,106 @@ "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.15.zip" } }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.8.2.linux-amd64", + "sha256": "c64de4f3c30f7a73ff9db637660c7aa0f00234368105b0a09fa8e24eebe910c3", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.8.2.linux-arm-v6", + "sha256": "d0e5d19cd67ea7a351e3bfe1de96f3d583a5b80f1bbadd61f7adcd61b147e5f5", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.8.2.linux-arm-v7", + "sha256": "b5bb1e28e9413a75b2600955c486870aafd234f69953601eecc3664bd3af7463", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.8.2.linux-arm64", + "sha256": "304d3d9822c75f98ad9cf57f0c234bcf326bbb96d791d551728cadd72a7a377f", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.8.2.linux-ppc64le", + "sha256": "32b317d86c700d920468f162f93ae2282777da556ee49b4329f6c72ee2b11b85", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.8.2.linux-riscv64", + "sha256": "76d5fcf92ffa31b3e470d8ec1ab11f7b6997729e5c94d543fec765ad79ad0630", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.8.2.linux-s390x", + "sha256": "ec4bb6f271f38dca5a377a70be24ee2108a85f6e6ba511ad3b805c4f1602a0d2", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.8.2.windows-amd64.exe", + "sha256": "abd54d5a589c7745b67990b4fdbd489c922864e3725353faf6859ceed835dd4a", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.8.2.windows-arm64.exe", + "sha256": "8fe575d9346d30e97240ee0dd85c22b5974e8ee898a5fd26ab0d7e6792bc3cf8", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-arm64.exe" + } + }, + "version": "0.8.2" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "6296d17268c77a7159f57f04ed26dd2989f909c58cca4d44d1865f28bd27dd67", + "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "92b423e2c4d0ca0a979d7b6a4fb13707612f8fa19b900bc6cd1c2cf83f2780c5", + "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "d728dcbe5e20103e9b025efdbb6bfbca9ea9866851e669f7775fe3ebb7ab945c", + "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "7efc61cc85fe712f14f04a6886d1481c96fe958be265f67482583b4b713b6a22", + "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "230e50b7f4bfc1705adb60cc5645df37a09873882230d60cc1ae20ba3099c521", + "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "6b2d97d7b48c66930d1c9e4b81e4526e059b68a18c98d4ff862b4ca28f345c9a", + "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "e40af00a5f3ef87d31372f949134411b574042b8c055b2e5da12b92192405cb6", + "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-ppc64le" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "c36e48910f095d07d582b69363fb3f902bb6fab9e2bd3d5ed82a67d1b2279a39", + "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "83b4ce5911505edc7164650e9edf480e042baf6cb45293297ad57592d56947db", + "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-windows-x86_64.exe" + } + }, + "version": "2.5.0" + }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ "", diff --git a/versions.sh b/versions.sh index 37589b247..01d6e2a72 100755 --- a/versions.sh +++ b/versions.sh @@ -68,6 +68,106 @@ dockerVersions="$( ' )" +buildxVersions="$( + git ls-remote --tags https://github.com/docker/buildx.git \ + | cut -d$'\t' -f2 \ + | grep '^refs/tags/v[0-9].*$' \ + | sed 's!^refs/tags/v!!; s!\^{}$!!' \ + | sort -ru +)" +buildx= +buildxVersion= +for buildxVersion in $buildxVersions; do + if checksums="$(curl -fsSL "https://github.com/docker/buildx/releases/download/v${buildxVersion}/checksums.txt")"; then + buildx="$(jq <<<"$checksums" -csR --arg version "$buildxVersion" ' + rtrimstr("\n") | split("\n") + | map( + split(" ") + | { + sha256: .[0], + file: .[1], + url: ("https://github.com/docker/buildx/releases/download/v" + $version + "/" + .[1]), + } + | { ( + .file + | capture("[.](?linux|windows|darwin)-(?[^.]+)([.]|$)") + // error("failed to parse os-arch from filename: " + .[1]) + | if .os == "linux" then "" else .os + "-" end + + ({ + "amd64": "amd64", + "arm-v6": "arm32v6", + "arm-v7": "arm32v7", + "arm64": "arm64v8", + "ppc64le": "ppc64le", + "riscv64": "riscv64", + "s390x": "s390x", + }[.arch] // error("unknown architecture: " + .arch)) + ): . } + ) + | add + | { + version: $version, + arches: ., + } + ')" + break + fi +done +if [ -z "$buildx" ]; then + echo >&2 'error: failed to determine buildx version!' + exit 1 +fi + +composeVersions="$( + git ls-remote --tags https://github.com/docker/compose.git \ + | cut -d$'\t' -f2 \ + | grep '^refs/tags/v[0-9].*$' \ + | sed 's!^refs/tags/v!!; s!\^{}$!!' \ + | sort -ru +)" +compose= +composeVersion= +for composeVersion in $composeVersions; do + if checksums="$(curl -fsSL "https://github.com/docker/compose/releases/download/v${composeVersion}/checksums.txt")"; then + compose="$(jq <<<"$checksums" -csR --arg version "$composeVersion" ' + rtrimstr("\n") | split("\n") + | map( + split(" *") + | { + sha256: .[0], + file: .[1], + url: ("https://github.com/docker/compose/releases/download/v" + $version + "/" + .[1]), + } + | { ( + .file + | ltrimstr("docker-compose-") + | rtrimstr(".exe") + | split("-") + | if .[0] == "linux" then "" else .[0] + "-" end + + ({ + aarch64: "arm64v8", + armv6: "arm32v6", + armv7: "arm32v7", + ppc64le: "ppc64le", + s390x: "s390x", + x86_64: "amd64", + }[.[1]] // error("unknown architecture: " + .[1])) + ): . } + ) + | add + | { + version: $version, + arches: ., + } + ')" + break + fi +done +if [ -z "$compose" ]; then + echo >&2 'error: failed to determine compose version!' + exit 1 +fi + for version in "${versions[@]}"; do rcVersion="${version%-rc}" channel='stable' @@ -99,15 +199,17 @@ for version in "${versions[@]}"; do fi fi - echo "$version: $fullVersion" + echo "$version: $fullVersion (buildx $buildxVersion, compose $composeVersion)" export fullVersion alpine dindLatest doc="$( - jq -nc '{ + jq -nc --argjson buildx "$buildx" --argjson compose "$compose" '{ version: env.fullVersion, arches: {}, alpine: env.alpine, dindCommit: env.dindLatest, + buildx: $buildx, + compose: $compose, }' )" From ca257b920303ae46cff2a8399471318ad48d67b4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 12 May 2022 10:04:58 -0700 Subject: [PATCH 065/667] Update 20.10 to 20.10.16 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 2834fda7e..5941c4c30 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -19,7 +19,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 20.10.15 +ENV DOCKER_VERSION 20.10.16 # 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) @@ -29,16 +29,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.15.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.16.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.15.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.16.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.15.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.16.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.15.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.16.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 020817c81..4d0d93b7c 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.15.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.16.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.15.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.16.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 7b0b63725..84bddcdcd 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.15 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.15.zip +ENV DOCKER_VERSION 20.10.16 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.16.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index 997218a7c..ff1877c79 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.15 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.15.zip +ENV DOCKER_VERSION 20.10.16 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.16.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/versions.json b/versions.json index 14fe361ce..f6d5bd59d 100644 --- a/versions.json +++ b/versions.json @@ -3,21 +3,21 @@ "alpine": "3.15", "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.15.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.15.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.16.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.16.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.15.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.16.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.15.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.16.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.15.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.15.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.16.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.16.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.15.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.16.zip" } }, "buildx": { @@ -129,7 +129,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.15" + "version": "20.10.16" }, "20.10-rc": null } From a7acc6e87f40924ac499415ba8f48b15208937ff Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 May 2022 10:04:19 -0700 Subject: [PATCH 066/667] Update 20.10 to compose 2.5.1 --- 20.10/Dockerfile | 26 +++++++++++++------------- versions.json | 38 +++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 5941c4c30..1bd4d2cba 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -96,33 +96,33 @@ RUN set -eux; \ chmod +x "$plugin"; \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.5.0 +ENV DOCKER_COMPOSE_VERSION 2.5.1 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-x86_64'; \ - sha256='6296d17268c77a7159f57f04ed26dd2989f909c58cca4d44d1865f28bd27dd67'; \ + url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-x86_64'; \ + sha256='d99de1ea7616f2a4c7914d37674f0650660a5e832be555805a71c0fc377233c9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-armv6'; \ - sha256='92b423e2c4d0ca0a979d7b6a4fb13707612f8fa19b900bc6cd1c2cf83f2780c5'; \ + url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-armv6'; \ + sha256='86f2eafdb2ff1f3885758854dd5e1c5ea9d81aa292623829fd3babe9d3fc6f9a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-armv7'; \ - sha256='d728dcbe5e20103e9b025efdbb6bfbca9ea9866851e669f7775fe3ebb7ab945c'; \ + url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-armv7'; \ + sha256='f5a15fa6ef16f3c79cf8c2e965d7426d1f3968c273eb588c76d1f2851b1bf90f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-aarch64'; \ - sha256='7efc61cc85fe712f14f04a6886d1481c96fe958be265f67482583b4b713b6a22'; \ + url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-aarch64'; \ + sha256='002662ed18a22d9d65d3d2c0358008c7c6a3db7dacb8983488130b3954d00e63'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-ppc64le'; \ - sha256='e40af00a5f3ef87d31372f949134411b574042b8c055b2e5da12b92192405cb6'; \ + url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-ppc64le'; \ + sha256='83612098d39d3485945ee0d49f1ede02e0de96fbb7658202770aec6ae0834853'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-s390x'; \ - sha256='c36e48910f095d07d582b69363fb3f902bb6fab9e2bd3d5ed82a67d1b2279a39'; \ + url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-s390x'; \ + sha256='68b9487106fd27e0f8c7defcf80fee2ab4f178f3ccc1d827fa0d2e82f80fa38b'; \ ;; \ *) echo >&2 "warning: unsupported compose architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index f6d5bd59d..85cdaace2 100644 --- a/versions.json +++ b/versions.json @@ -74,51 +74,51 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6296d17268c77a7159f57f04ed26dd2989f909c58cca4d44d1865f28bd27dd67", - "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-x86_64" + "sha256": "d99de1ea7616f2a4c7914d37674f0650660a5e832be555805a71c0fc377233c9", + "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "92b423e2c4d0ca0a979d7b6a4fb13707612f8fa19b900bc6cd1c2cf83f2780c5", - "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-armv6" + "sha256": "86f2eafdb2ff1f3885758854dd5e1c5ea9d81aa292623829fd3babe9d3fc6f9a", + "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d728dcbe5e20103e9b025efdbb6bfbca9ea9866851e669f7775fe3ebb7ab945c", - "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-armv7" + "sha256": "f5a15fa6ef16f3c79cf8c2e965d7426d1f3968c273eb588c76d1f2851b1bf90f", + "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "7efc61cc85fe712f14f04a6886d1481c96fe958be265f67482583b4b713b6a22", - "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-aarch64" + "sha256": "002662ed18a22d9d65d3d2c0358008c7c6a3db7dacb8983488130b3954d00e63", + "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "230e50b7f4bfc1705adb60cc5645df37a09873882230d60cc1ae20ba3099c521", - "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-darwin-x86_64" + "sha256": "d6dc7707387d01f0d9a354f867a990c0ae60e7bc32ce35cac840019e0cc72feb", + "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "6b2d97d7b48c66930d1c9e4b81e4526e059b68a18c98d4ff862b4ca28f345c9a", - "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-darwin-aarch64" + "sha256": "c2a92b35d659ebe90bdd36652ac27be9c62404efe49ba2e3bce6919a8e4bd051", + "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "e40af00a5f3ef87d31372f949134411b574042b8c055b2e5da12b92192405cb6", - "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-ppc64le" + "sha256": "83612098d39d3485945ee0d49f1ede02e0de96fbb7658202770aec6ae0834853", + "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-ppc64le" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "c36e48910f095d07d582b69363fb3f902bb6fab9e2bd3d5ed82a67d1b2279a39", - "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-linux-s390x" + "sha256": "68b9487106fd27e0f8c7defcf80fee2ab4f178f3ccc1d827fa0d2e82f80fa38b", + "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "83b4ce5911505edc7164650e9edf480e042baf6cb45293297ad57592d56947db", - "url": "https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-windows-x86_64.exe" + "sha256": "1013d982e67f4b08f4493234b3b6cead3d9428ed24a82f8703e014becabd83a5", + "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-windows-x86_64.exe" } }, - "version": "2.5.0" + "version": "2.5.1" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From ca3e8c6b38955ed5daa0e6716414a4ef3b353d9c Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 26 May 2022 11:32:01 +0200 Subject: [PATCH 067/667] Update to Alpine 3.16 --- 20.10/Dockerfile | 2 +- versions.json | 2 +- versions.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 1bd4d2cba..877654248 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.15 +FROM alpine:3.16 RUN apk add --no-cache \ ca-certificates \ diff --git a/versions.json b/versions.json index 85cdaace2..565d49123 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,6 @@ { "20.10": { - "alpine": "3.15", + "alpine": "3.16", "arches": { "amd64": { "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.16.tgz", diff --git a/versions.sh b/versions.sh index 01d6e2a72..91ca38da7 100755 --- a/versions.sh +++ b/versions.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail declare -A alpineVersion=( - [20.10]='3.15' + [20.10]='3.16' ) # bashbrew arch to docker-release-arch From 6aaba9b67b77a7af8b0fbe7d3f80ebda42a65a8e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 30 May 2022 10:04:16 -0700 Subject: [PATCH 068/667] Update 20.10 to compose 2.6.0 --- 20.10/Dockerfile | 26 +++++++++++++------------- versions.json | 38 +++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 877654248..c73a05aae 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -96,33 +96,33 @@ RUN set -eux; \ chmod +x "$plugin"; \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.5.1 +ENV DOCKER_COMPOSE_VERSION 2.6.0 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-x86_64'; \ - sha256='d99de1ea7616f2a4c7914d37674f0650660a5e832be555805a71c0fc377233c9'; \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-x86_64'; \ + sha256='4eb9084cd9e33d906bd1ea11b5bc2e77a43f8ffbe7228bcf7c829a7687f5c4bb'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-armv6'; \ - sha256='86f2eafdb2ff1f3885758854dd5e1c5ea9d81aa292623829fd3babe9d3fc6f9a'; \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv6'; \ + sha256='6f447869c2286d583d5497e8a1c50b7251dc9f0763c45b064a4b898a53ebce4c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-armv7'; \ - sha256='f5a15fa6ef16f3c79cf8c2e965d7426d1f3968c273eb588c76d1f2851b1bf90f'; \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv7'; \ + sha256='cf566ae18f89498bb20ac71d949b82b97bec3e9f972e009141c4f2faf440257a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-aarch64'; \ - sha256='002662ed18a22d9d65d3d2c0358008c7c6a3db7dacb8983488130b3954d00e63'; \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-aarch64'; \ + sha256='f2bc74dddaa58add7b428b5a764ccd4f048b366f3eb5c80a77ff06fcdc00b3ce'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-ppc64le'; \ - sha256='83612098d39d3485945ee0d49f1ede02e0de96fbb7658202770aec6ae0834853'; \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-ppc64le'; \ + sha256='0e6163ccbddf4faea428a78c46c214c6bba0ab3fef57e3cad364e9ca520fa176'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-s390x'; \ - sha256='68b9487106fd27e0f8c7defcf80fee2ab4f178f3ccc1d827fa0d2e82f80fa38b'; \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-s390x'; \ + sha256='df667634751a575ab29bc4f125b69dfa09d1924daf26bbc0f46e6b09ee1e6699'; \ ;; \ *) echo >&2 "warning: unsupported compose architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 565d49123..ecdf236af 100644 --- a/versions.json +++ b/versions.json @@ -74,51 +74,51 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "d99de1ea7616f2a4c7914d37674f0650660a5e832be555805a71c0fc377233c9", - "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-x86_64" + "sha256": "4eb9084cd9e33d906bd1ea11b5bc2e77a43f8ffbe7228bcf7c829a7687f5c4bb", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "86f2eafdb2ff1f3885758854dd5e1c5ea9d81aa292623829fd3babe9d3fc6f9a", - "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-armv6" + "sha256": "6f447869c2286d583d5497e8a1c50b7251dc9f0763c45b064a4b898a53ebce4c", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "f5a15fa6ef16f3c79cf8c2e965d7426d1f3968c273eb588c76d1f2851b1bf90f", - "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-armv7" + "sha256": "cf566ae18f89498bb20ac71d949b82b97bec3e9f972e009141c4f2faf440257a", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "002662ed18a22d9d65d3d2c0358008c7c6a3db7dacb8983488130b3954d00e63", - "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-aarch64" + "sha256": "f2bc74dddaa58add7b428b5a764ccd4f048b366f3eb5c80a77ff06fcdc00b3ce", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "d6dc7707387d01f0d9a354f867a990c0ae60e7bc32ce35cac840019e0cc72feb", - "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-darwin-x86_64" + "sha256": "21ff040b59dbf351ebfb34f517ec678121acc0ae1fd977ccc15ec46f91e043ba", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "c2a92b35d659ebe90bdd36652ac27be9c62404efe49ba2e3bce6919a8e4bd051", - "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-darwin-aarch64" + "sha256": "c59d8178f3eab739b71db9c1b0fc8d267e40f4e1bf269c891b025535ec29f8ed", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "83612098d39d3485945ee0d49f1ede02e0de96fbb7658202770aec6ae0834853", - "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-ppc64le" + "sha256": "0e6163ccbddf4faea428a78c46c214c6bba0ab3fef57e3cad364e9ca520fa176", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-ppc64le" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "68b9487106fd27e0f8c7defcf80fee2ab4f178f3ccc1d827fa0d2e82f80fa38b", - "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-linux-s390x" + "sha256": "df667634751a575ab29bc4f125b69dfa09d1924daf26bbc0f46e6b09ee1e6699", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "1013d982e67f4b08f4493234b3b6cead3d9428ed24a82f8703e014becabd83a5", - "url": "https://github.com/docker/compose/releases/download/v2.5.1/docker-compose-windows-x86_64.exe" + "sha256": "f4c214a9c66c60e57f3377bf86531ccd3d70d52308e7037e57c3ede34d461426", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-windows-x86_64.exe" } }, - "version": "2.5.1" + "version": "2.6.0" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 4c1b73e7046422ca1339b76935c2e2f4251b9c20 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 3 Jun 2022 15:24:23 -0700 Subject: [PATCH 069/667] Add 22.06.0-beta.0 --- 22.06-rc/Dockerfile | 151 +++++++++++++ 22.06-rc/dind-rootless/Dockerfile | 55 +++++ 22.06-rc/dind/Dockerfile | 53 +++++ 22.06-rc/dind/dockerd-entrypoint.sh | 198 ++++++++++++++++++ 22.06-rc/docker-entrypoint.sh | 61 ++++++ 22.06-rc/git/Dockerfile | 9 + 22.06-rc/modprobe.sh | 20 ++ .../windows/windowsservercore-1809/Dockerfile | 40 ++++ .../windowsservercore-ltsc2022/Dockerfile | 40 ++++ Dockerfile.template | 2 +- versions.json | 135 +++++++++++- versions.sh | 19 +- 12 files changed, 769 insertions(+), 14 deletions(-) create mode 100644 22.06-rc/Dockerfile create mode 100644 22.06-rc/dind-rootless/Dockerfile create mode 100644 22.06-rc/dind/Dockerfile create mode 100755 22.06-rc/dind/dockerd-entrypoint.sh create mode 100755 22.06-rc/docker-entrypoint.sh create mode 100644 22.06-rc/git/Dockerfile create mode 100755 22.06-rc/modprobe.sh create mode 100644 22.06-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 22.06-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/22.06-rc/Dockerfile b/22.06-rc/Dockerfile new file mode 100644 index 000000000..496e7f9b8 --- /dev/null +++ b/22.06-rc/Dockerfile @@ -0,0 +1,151 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.16 + +RUN apk add --no-cache \ + ca-certificates \ +# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 + libc6-compat \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149 +# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 +# - 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 22.06.0-beta.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) + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-22.06.0-beta.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-22.06.0-beta.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-22.06.0-beta.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-22.06.0-beta.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O docker.tgz "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.8.2 +RUN set -eux; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64'; \ + sha256='c64de4f3c30f7a73ff9db637660c7aa0f00234368105b0a09fa8e24eebe910c3'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v6'; \ + sha256='d0e5d19cd67ea7a351e3bfe1de96f3d583a5b80f1bbadd61f7adcd61b147e5f5'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v7'; \ + sha256='b5bb1e28e9413a75b2600955c486870aafd234f69953601eecc3664bd3af7463'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm64'; \ + sha256='304d3d9822c75f98ad9cf57f0c234bcf326bbb96d791d551728cadd72a7a377f'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-ppc64le'; \ + sha256='32b317d86c700d920468f162f93ae2282777da556ee49b4329f6c72ee2b11b85'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-riscv64'; \ + sha256='76d5fcf92ffa31b3e470d8ec1ab11f7b6997729e5c94d543fec765ad79ad0630'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x'; \ + sha256='ec4bb6f271f38dca5a377a70be24ee2108a85f6e6ba511ad3b805c4f1602a0d2'; \ + ;; \ + *) echo >&2 "warning: unsupported buildx architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + plugin='/usr/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + wget -O "$plugin" "$url"; \ + echo "$sha256 *$plugin" | sha256sum -c -; \ + chmod +x "$plugin"; \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.6.0 +RUN set -eux; \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-x86_64'; \ + sha256='4eb9084cd9e33d906bd1ea11b5bc2e77a43f8ffbe7228bcf7c829a7687f5c4bb'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv6'; \ + sha256='6f447869c2286d583d5497e8a1c50b7251dc9f0763c45b064a4b898a53ebce4c'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv7'; \ + sha256='cf566ae18f89498bb20ac71d949b82b97bec3e9f972e009141c4f2faf440257a'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-aarch64'; \ + sha256='f2bc74dddaa58add7b428b5a764ccd4f048b366f3eb5c80a77ff06fcdc00b3ce'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-ppc64le'; \ + sha256='0e6163ccbddf4faea428a78c46c214c6bba0ab3fef57e3cad364e9ca520fa176'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-s390x'; \ + sha256='df667634751a575ab29bc4f125b69dfa09d1924daf26bbc0f46e6b09ee1e6699'; \ + ;; \ + *) echo >&2 "warning: unsupported compose architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + plugin='/usr/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + wget -O "$plugin" "$url"; \ + echo "$sha256 *$plugin" | sha256sum -c -; \ + chmod +x "$plugin"; \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/22.06-rc/dind-rootless/Dockerfile b/22.06-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..b05a5e3d7 --- /dev/null +++ b/22.06-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:22.06-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 +RUN apk add --no-cache iproute2 + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-22.06.0-beta.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-22.06.0-beta.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O rootless.tgz "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/22.06-rc/dind/Dockerfile b/22.06-rc/dind/Dockerfile new file mode 100644 index 000000000..8b64f8e00 --- /dev/null +++ b/22.06-rc/dind/Dockerfile @@ -0,0 +1,53 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:22.06-rc + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + ip6tables \ + iptables \ + openssl \ + shadow-uidmap \ + xfsprogs \ + xz \ +# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) + pigz \ + ; \ +# only install zfs if it's available for the current architecture +# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) +# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch + if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ + apk add --no-cache zfs; \ + fi + +# TODO aufs-tools + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/22.06-rc/dind/dockerd-entrypoint.sh b/22.06-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..38bc26293 --- /dev/null +++ b/22.06-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,198 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ + && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ + ; then + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + if dockerd --version | grep -qF ' 20.10.'; then + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + fi + + if ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + modprobe ip_tables || : + fi + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/22.06-rc/docker-entrypoint.sh b/22.06-rc/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/22.06-rc/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/22.06-rc/git/Dockerfile b/22.06-rc/git/Dockerfile new file mode 100644 index 000000000..52b3e92af --- /dev/null +++ b/22.06-rc/git/Dockerfile @@ -0,0 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:22.06-rc + +RUN apk add --no-cache git diff --git a/22.06-rc/modprobe.sh b/22.06-rc/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/22.06-rc/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/22.06-rc/windows/windowsservercore-1809/Dockerfile b/22.06-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..081670fe0 --- /dev/null +++ b/22.06-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,40 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 22.06.0-beta.0 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-22.06.0-beta.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; diff --git a/22.06-rc/windows/windowsservercore-ltsc2022/Dockerfile b/22.06-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..a4fcb6be6 --- /dev/null +++ b/22.06-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,40 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 22.06.0-beta.0 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-22.06.0-beta.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; diff --git a/Dockerfile.template b/Dockerfile.template index 67084c2e9..c0d8ce3ad 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -1,4 +1,4 @@ -FROM alpine:{{ .alpine }} +FROM alpine:3.16 RUN apk add --no-cache \ ca-certificates \ diff --git a/versions.json b/versions.json index ecdf236af..e094d5352 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,5 @@ { "20.10": { - "alpine": "3.16", "arches": { "amd64": { "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.16.tgz", @@ -131,5 +130,137 @@ ], "version": "20.10.16" }, - "20.10-rc": null + "20.10-rc": null, + "22.06": null, + "22.06-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-22.06.0-beta.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-22.06.0-beta.0.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-22.06.0-beta.0.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-22.06.0-beta.0.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-22.06.0-beta.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-22.06.0-beta.0.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-22.06.0-beta.0.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.8.2.linux-amd64", + "sha256": "c64de4f3c30f7a73ff9db637660c7aa0f00234368105b0a09fa8e24eebe910c3", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.8.2.linux-arm-v6", + "sha256": "d0e5d19cd67ea7a351e3bfe1de96f3d583a5b80f1bbadd61f7adcd61b147e5f5", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.8.2.linux-arm-v7", + "sha256": "b5bb1e28e9413a75b2600955c486870aafd234f69953601eecc3664bd3af7463", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.8.2.linux-arm64", + "sha256": "304d3d9822c75f98ad9cf57f0c234bcf326bbb96d791d551728cadd72a7a377f", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.8.2.linux-ppc64le", + "sha256": "32b317d86c700d920468f162f93ae2282777da556ee49b4329f6c72ee2b11b85", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.8.2.linux-riscv64", + "sha256": "76d5fcf92ffa31b3e470d8ec1ab11f7b6997729e5c94d543fec765ad79ad0630", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.8.2.linux-s390x", + "sha256": "ec4bb6f271f38dca5a377a70be24ee2108a85f6e6ba511ad3b805c4f1602a0d2", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.8.2.windows-amd64.exe", + "sha256": "abd54d5a589c7745b67990b4fdbd489c922864e3725353faf6859ceed835dd4a", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.8.2.windows-arm64.exe", + "sha256": "8fe575d9346d30e97240ee0dd85c22b5974e8ee898a5fd26ab0d7e6792bc3cf8", + "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-arm64.exe" + } + }, + "version": "0.8.2" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "4eb9084cd9e33d906bd1ea11b5bc2e77a43f8ffbe7228bcf7c829a7687f5c4bb", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "6f447869c2286d583d5497e8a1c50b7251dc9f0763c45b064a4b898a53ebce4c", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "cf566ae18f89498bb20ac71d949b82b97bec3e9f972e009141c4f2faf440257a", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "f2bc74dddaa58add7b428b5a764ccd4f048b366f3eb5c80a77ff06fcdc00b3ce", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "21ff040b59dbf351ebfb34f517ec678121acc0ae1fd977ccc15ec46f91e043ba", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "c59d8178f3eab739b71db9c1b0fc8d267e40f4e1bf269c891b025535ec29f8ed", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "0e6163ccbddf4faea428a78c46c214c6bba0ab3fef57e3cad364e9ca520fa176", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-ppc64le" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "df667634751a575ab29bc4f125b69dfa09d1924daf26bbc0f46e6b09ee1e6699", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "f4c214a9c66c60e57f3377bf86531ccd3d70d52308e7037e57c3ede34d461426", + "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-windows-x86_64.exe" + } + }, + "version": "2.6.0" + }, + "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", + "variants": [ + "", + "dind", + "dind-rootless", + "git", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "22.06.0-beta.0" + } } diff --git a/versions.sh b/versions.sh index 91ca38da7..3283578b1 100755 --- a/versions.sh +++ b/versions.sh @@ -1,10 +1,6 @@ #!/usr/bin/env bash set -Eeuo pipefail -declare -A alpineVersion=( - [20.10]='3.16' -) - # bashbrew arch to docker-release-arch declare -A dockerArches=( ['amd64']='x86_64' @@ -20,9 +16,7 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" versions=( "$@" ) if [ ${#versions[@]} -eq 0 ]; then - versions=( "${!alpineVersion[@]}" ) - # try RC releases after doing the non-RCs so we can check whether they're newer (and thus whether we should care) - versions+=( "${versions[@]/%/-rc}" ) + versions=( */ ) json='{}' else json="$(< versions.json)" @@ -171,7 +165,6 @@ fi for version in "${versions[@]}"; do rcVersion="${version%-rc}" channel='stable' - alpine="${alpineVersion[$rcVersion]}" versionOptions="$(grep "^$rcVersion[.]" <<<"$dockerVersions")" @@ -201,12 +194,11 @@ for version in "${versions[@]}"; do echo "$version: $fullVersion (buildx $buildxVersion, compose $composeVersion)" - export fullVersion alpine dindLatest + export fullVersion dindLatest doc="$( jq -nc --argjson buildx "$buildx" --argjson compose "$compose" '{ version: env.fullVersion, arches: {}, - alpine: env.alpine, dindCommit: env.dindLatest, buildx: $buildx, compose: $compose, @@ -269,7 +261,12 @@ for version in "${versions[@]}"; do doc="$(jq <<<"$doc" -c '.variants += [ env.variant ]')" done - json="$(jq <<<"$json" -c --argjson doc "$doc" '.[env.version] = $doc')" + json="$(jq <<<"$json" -c --argjson doc "$doc" ' + .[env.version] = $doc + # make sure both "XX.YY" and "XX.YY-rc" always exist + | .[env.rcVersion] //= null + | .[env.rcVersion + "-rc"] //= null + ')" done jq <<<"$json" -S . > versions.json From a80938cf59d0352753ed1349e820843284b1cec9 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 3 Jun 2022 16:03:50 -0700 Subject: [PATCH 070/667] Update versions.sh to handle unreleased non-rc versions better --- versions.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/versions.sh b/versions.sh index 3283578b1..61969cea5 100755 --- a/versions.sh +++ b/versions.sh @@ -164,6 +164,7 @@ fi for version in "${versions[@]}"; do rcVersion="${version%-rc}" + export version rcVersion channel='stable' versionOptions="$(grep "^$rcVersion[.]" <<<"$dockerVersions")" @@ -174,14 +175,17 @@ for version in "${versions[@]}"; do channel='test' fi - fullVersion="$(grep $rcGrepV -E -- '-(rc|tp|beta)' <<<"$versionOptions" | tail -1)" - if [ -z "$fullVersion" ]; then + if ! fullVersion="$(grep $rcGrepV -E -- '-(rc|tp|beta)' <<<"$versionOptions" | tail -1)" || [ -z "$fullVersion" ]; then + if currentNull="$(jq -r '.[env.version] == null' versions.json)" && [ "$currentNull" = 'true' ]; then + echo >&2 "warning: skipping '$version' (does not appear to be released yet)" + json="$(jq <<<"$json" -c '.[env.version] = null')" + continue + fi echo >&2 "error: cannot find full version for $version" exit 1 fi # if this is a "-rc" release, let's make sure the release it contains isn't already GA (and thus something we should not publish anymore) - export version rcVersion if [ "$rcVersion" != "$version" ] && rcFullVersion="$(jq <<<"$json" -r '.[env.rcVersion].version // ""')" && [ -n "$rcFullVersion" ]; then latestVersion="$({ echo "$fullVersion"; echo "$rcFullVersion"; } | sort -V | tail -1)" if [[ "$fullVersion" == "$rcFullVersion"* ]] || [ "$latestVersion" = "$rcFullVersion" ]; then From 034e1d03eaf2c35ce4a21c4a4b621e2d2174b62e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 6 Jun 2022 22:04:17 -0700 Subject: [PATCH 071/667] Update 20.10 to 20.10.17 --- 20.10/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index c73a05aae..c4d3cc983 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -19,7 +19,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 20.10.16 +ENV DOCKER_VERSION 20.10.17 # 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) @@ -29,16 +29,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.16.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.16.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.17.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.16.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.17.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.16.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.17.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 4d0d93b7c..b7380ba05 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.16.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.17.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.16.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.17.tgz'; \ ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 84bddcdcd..828572326 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.16 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.16.zip +ENV DOCKER_VERSION 20.10.17 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.17.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index ff1877c79..04c186d6a 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.16 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.16.zip +ENV DOCKER_VERSION 20.10.17 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.17.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/versions.json b/versions.json index e094d5352..7dc81880c 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "20.10": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.16.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.16.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.17.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.16.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.17.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.16.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.17.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.16.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.16.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.17.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.17.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.16.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.17.zip" } }, "buildx": { @@ -128,7 +128,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.16" + "version": "20.10.17" }, "20.10-rc": null, "22.06": null, From b4ebf24fc840e7f223c9e7ab361a02fa2ffd2e3e Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 27 Oct 2020 15:15:42 +0900 Subject: [PATCH 072/667] rootless: add fuse-overlayfs The kernel-mode overlayfs doesn't work with rootless, though Ubuntu and Debian has patched their kernels to enable overlayfs for rootless. OTOH fuse-overlayfs works with rootless on any distro with kernel >= 4.18. fuse-overlayfs is supported since Docker 20.10. https://github.com/moby/moby/issues/40218 Signed-off-by: Akihiro Suda --- 20.10/dind-rootless/Dockerfile | 2 +- 22.06-rc/dind-rootless/Dockerfile | 2 +- Dockerfile-dind-rootless.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index b7380ba05..d56c683c3 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -8,7 +8,7 @@ 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 -RUN apk add --no-cache iproute2 +RUN apk add --no-cache iproute2 fuse-overlayfs # "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR RUN mkdir /run/user && chmod 1777 /run/user diff --git a/22.06-rc/dind-rootless/Dockerfile b/22.06-rc/dind-rootless/Dockerfile index b05a5e3d7..c867d9bf7 100644 --- a/22.06-rc/dind-rootless/Dockerfile +++ b/22.06-rc/dind-rootless/Dockerfile @@ -8,7 +8,7 @@ FROM docker:22.06-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 -RUN apk add --no-cache iproute2 +RUN apk add --no-cache iproute2 fuse-overlayfs # "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR RUN mkdir /run/user && chmod 1777 /run/user diff --git a/Dockerfile-dind-rootless.template b/Dockerfile-dind-rootless.template index 691663c1d..896fb8dac 100644 --- a/Dockerfile-dind-rootless.template +++ b/Dockerfile-dind-rootless.template @@ -2,7 +2,7 @@ FROM docker:{{ env.version }}-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 -RUN apk add --no-cache iproute2 +RUN apk add --no-cache iproute2 fuse-overlayfs # "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR RUN mkdir /run/user && chmod 1777 /run/user From c4bcedc4850e5f50313ec84d057b1f47fbdfbf5f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 23 Jun 2022 10:04:20 -0700 Subject: [PATCH 073/667] Update 20.10 to compose 2.6.1 --- 20.10/Dockerfile | 26 +++++++++++++------------- versions.json | 38 +++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index c4d3cc983..8c84fb536 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -96,33 +96,33 @@ RUN set -eux; \ chmod +x "$plugin"; \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.6.0 +ENV DOCKER_COMPOSE_VERSION 2.6.1 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-x86_64'; \ - sha256='4eb9084cd9e33d906bd1ea11b5bc2e77a43f8ffbe7228bcf7c829a7687f5c4bb'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-x86_64'; \ + sha256='ed79398562f3a80a5d8c068fde14b0b12101e80b494aabb2b3533eaa10599e0f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv6'; \ - sha256='6f447869c2286d583d5497e8a1c50b7251dc9f0763c45b064a4b898a53ebce4c'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv6'; \ + sha256='2b5efc48e8359047cc280712f52e97be23fcb571b47b1e67ba6f56e971ac30f5'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv7'; \ - sha256='cf566ae18f89498bb20ac71d949b82b97bec3e9f972e009141c4f2faf440257a'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv7'; \ + sha256='727f67b78d6b1fbfed5de4d66869a691551f7341ad71504476d8a902e37588bb'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-aarch64'; \ - sha256='f2bc74dddaa58add7b428b5a764ccd4f048b366f3eb5c80a77ff06fcdc00b3ce'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-aarch64'; \ + sha256='2890aade218c145827521efb247b5765ac10ac5c46f21dddb2220c03c98d7f83'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-ppc64le'; \ - sha256='0e6163ccbddf4faea428a78c46c214c6bba0ab3fef57e3cad364e9ca520fa176'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-ppc64le'; \ + sha256='93560efd323f39fe86244b80cbe1ffeb2c16b169c72a3ae25535def98c04e744'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-s390x'; \ - sha256='df667634751a575ab29bc4f125b69dfa09d1924daf26bbc0f46e6b09ee1e6699'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-s390x'; \ + sha256='2a56c35df12d7a7ce9a9ae83426df36a612b0035ee36053912594d6f5a6ff356'; \ ;; \ *) echo >&2 "warning: unsupported compose architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 7dc81880c..cf5226f0f 100644 --- a/versions.json +++ b/versions.json @@ -73,51 +73,51 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "4eb9084cd9e33d906bd1ea11b5bc2e77a43f8ffbe7228bcf7c829a7687f5c4bb", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-x86_64" + "sha256": "ed79398562f3a80a5d8c068fde14b0b12101e80b494aabb2b3533eaa10599e0f", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "6f447869c2286d583d5497e8a1c50b7251dc9f0763c45b064a4b898a53ebce4c", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv6" + "sha256": "2b5efc48e8359047cc280712f52e97be23fcb571b47b1e67ba6f56e971ac30f5", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "cf566ae18f89498bb20ac71d949b82b97bec3e9f972e009141c4f2faf440257a", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv7" + "sha256": "727f67b78d6b1fbfed5de4d66869a691551f7341ad71504476d8a902e37588bb", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "f2bc74dddaa58add7b428b5a764ccd4f048b366f3eb5c80a77ff06fcdc00b3ce", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-aarch64" + "sha256": "2890aade218c145827521efb247b5765ac10ac5c46f21dddb2220c03c98d7f83", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "21ff040b59dbf351ebfb34f517ec678121acc0ae1fd977ccc15ec46f91e043ba", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-darwin-x86_64" + "sha256": "38c180a1a8c258173861c2adba99c4bd50510261d2d2407421174b096ed098f0", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "c59d8178f3eab739b71db9c1b0fc8d267e40f4e1bf269c891b025535ec29f8ed", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-darwin-aarch64" + "sha256": "54a4003be4d1ae026a50766edd1531c9d9e5e5209e01957c4242199789b39187", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "0e6163ccbddf4faea428a78c46c214c6bba0ab3fef57e3cad364e9ca520fa176", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-ppc64le" + "sha256": "93560efd323f39fe86244b80cbe1ffeb2c16b169c72a3ae25535def98c04e744", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-ppc64le" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "df667634751a575ab29bc4f125b69dfa09d1924daf26bbc0f46e6b09ee1e6699", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-s390x" + "sha256": "2a56c35df12d7a7ce9a9ae83426df36a612b0035ee36053912594d6f5a6ff356", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "f4c214a9c66c60e57f3377bf86531ccd3d70d52308e7037e57c3ede34d461426", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-windows-x86_64.exe" + "sha256": "7e8231012d66c164cfbe46d17aec5f614a2ca4b0fc20dd78bd7b1b3fcbc4f28d", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-windows-x86_64.exe" } }, - "version": "2.6.0" + "version": "2.6.1" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 038fb86c696159554fb1e7f9f43a7d72de872748 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 23 Jun 2022 10:06:49 -0700 Subject: [PATCH 074/667] Update 22.06-rc to compose 2.6.1 --- 22.06-rc/Dockerfile | 26 +++++++++++++------------- versions.json | 38 +++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/22.06-rc/Dockerfile b/22.06-rc/Dockerfile index 496e7f9b8..43d7f033d 100644 --- a/22.06-rc/Dockerfile +++ b/22.06-rc/Dockerfile @@ -96,33 +96,33 @@ RUN set -eux; \ chmod +x "$plugin"; \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.6.0 +ENV DOCKER_COMPOSE_VERSION 2.6.1 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-x86_64'; \ - sha256='4eb9084cd9e33d906bd1ea11b5bc2e77a43f8ffbe7228bcf7c829a7687f5c4bb'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-x86_64'; \ + sha256='ed79398562f3a80a5d8c068fde14b0b12101e80b494aabb2b3533eaa10599e0f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv6'; \ - sha256='6f447869c2286d583d5497e8a1c50b7251dc9f0763c45b064a4b898a53ebce4c'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv6'; \ + sha256='2b5efc48e8359047cc280712f52e97be23fcb571b47b1e67ba6f56e971ac30f5'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv7'; \ - sha256='cf566ae18f89498bb20ac71d949b82b97bec3e9f972e009141c4f2faf440257a'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv7'; \ + sha256='727f67b78d6b1fbfed5de4d66869a691551f7341ad71504476d8a902e37588bb'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-aarch64'; \ - sha256='f2bc74dddaa58add7b428b5a764ccd4f048b366f3eb5c80a77ff06fcdc00b3ce'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-aarch64'; \ + sha256='2890aade218c145827521efb247b5765ac10ac5c46f21dddb2220c03c98d7f83'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-ppc64le'; \ - sha256='0e6163ccbddf4faea428a78c46c214c6bba0ab3fef57e3cad364e9ca520fa176'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-ppc64le'; \ + sha256='93560efd323f39fe86244b80cbe1ffeb2c16b169c72a3ae25535def98c04e744'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-s390x'; \ - sha256='df667634751a575ab29bc4f125b69dfa09d1924daf26bbc0f46e6b09ee1e6699'; \ + url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-s390x'; \ + sha256='2a56c35df12d7a7ce9a9ae83426df36a612b0035ee36053912594d6f5a6ff356'; \ ;; \ *) echo >&2 "warning: unsupported compose architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index cf5226f0f..2cd0f11a5 100644 --- a/versions.json +++ b/versions.json @@ -206,51 +206,51 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "4eb9084cd9e33d906bd1ea11b5bc2e77a43f8ffbe7228bcf7c829a7687f5c4bb", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-x86_64" + "sha256": "ed79398562f3a80a5d8c068fde14b0b12101e80b494aabb2b3533eaa10599e0f", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "6f447869c2286d583d5497e8a1c50b7251dc9f0763c45b064a4b898a53ebce4c", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv6" + "sha256": "2b5efc48e8359047cc280712f52e97be23fcb571b47b1e67ba6f56e971ac30f5", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "cf566ae18f89498bb20ac71d949b82b97bec3e9f972e009141c4f2faf440257a", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-armv7" + "sha256": "727f67b78d6b1fbfed5de4d66869a691551f7341ad71504476d8a902e37588bb", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "f2bc74dddaa58add7b428b5a764ccd4f048b366f3eb5c80a77ff06fcdc00b3ce", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-aarch64" + "sha256": "2890aade218c145827521efb247b5765ac10ac5c46f21dddb2220c03c98d7f83", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "21ff040b59dbf351ebfb34f517ec678121acc0ae1fd977ccc15ec46f91e043ba", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-darwin-x86_64" + "sha256": "38c180a1a8c258173861c2adba99c4bd50510261d2d2407421174b096ed098f0", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "c59d8178f3eab739b71db9c1b0fc8d267e40f4e1bf269c891b025535ec29f8ed", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-darwin-aarch64" + "sha256": "54a4003be4d1ae026a50766edd1531c9d9e5e5209e01957c4242199789b39187", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "0e6163ccbddf4faea428a78c46c214c6bba0ab3fef57e3cad364e9ca520fa176", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-ppc64le" + "sha256": "93560efd323f39fe86244b80cbe1ffeb2c16b169c72a3ae25535def98c04e744", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-ppc64le" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "df667634751a575ab29bc4f125b69dfa09d1924daf26bbc0f46e6b09ee1e6699", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-linux-s390x" + "sha256": "2a56c35df12d7a7ce9a9ae83426df36a612b0035ee36053912594d6f5a6ff356", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "f4c214a9c66c60e57f3377bf86531ccd3d70d52308e7037e57c3ede34d461426", - "url": "https://github.com/docker/compose/releases/download/v2.6.0/docker-compose-windows-x86_64.exe" + "sha256": "7e8231012d66c164cfbe46d17aec5f614a2ca4b0fc20dd78bd7b1b3fcbc4f28d", + "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-windows-x86_64.exe" } }, - "version": "2.6.0" + "version": "2.6.1" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 00daa2e3acdbf0c989c090a6d66a5a146f40ba6d Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 13 Jul 2022 17:12:01 -0700 Subject: [PATCH 075/667] Update jq-template for speed improvements --- apply-templates.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apply-templates.sh b/apply-templates.sh index 43970ff7f..e74505a94 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -7,7 +7,8 @@ jqt='.jq-template.awk' if [ -n "${BASHBREW_SCRIPTS:-}" ]; then jqt="$BASHBREW_SCRIPTS/jq-template.awk" elif [ "$BASH_SOURCE" -nt "$jqt" ]; then - wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/5f0c26381fb7cc78b2d217d58007800bdcfbcfa1/scripts/jq-template.awk' + # https://github.com/docker-library/bashbrew/blob/master/scripts/jq-template.awk + wget -qO "$jqt" 'https://github.com/docker-library/bashbrew/raw/9f6a35772ac863a0241f147c820354e4008edf38/scripts/jq-template.awk' fi if [ "$#" -eq 0 ]; then From a9aa984f3033753674b96b9f614f69b4650ddfa9 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 20 Jul 2022 04:04:16 -0700 Subject: [PATCH 076/667] Update 20.10 to compose 2.7.0 --- 20.10/Dockerfile | 26 +++++++++++++------------- versions.json | 38 +++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/20.10/Dockerfile b/20.10/Dockerfile index 8c84fb536..cae822625 100644 --- a/20.10/Dockerfile +++ b/20.10/Dockerfile @@ -96,33 +96,33 @@ RUN set -eux; \ chmod +x "$plugin"; \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.6.1 +ENV DOCKER_COMPOSE_VERSION 2.7.0 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-x86_64'; \ - sha256='ed79398562f3a80a5d8c068fde14b0b12101e80b494aabb2b3533eaa10599e0f'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-x86_64'; \ + sha256='184df811a70366fa339e99df38fc6ff24fc9e51b3388335efe51c1941377d4ce'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv6'; \ - sha256='2b5efc48e8359047cc280712f52e97be23fcb571b47b1e67ba6f56e971ac30f5'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv6'; \ + sha256='a5fc14755a5de6c0998907a73b1eb115e3e45b80a05d284fecab2825a3722fca'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv7'; \ - sha256='727f67b78d6b1fbfed5de4d66869a691551f7341ad71504476d8a902e37588bb'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv7'; \ + sha256='53ed781ff04efa2e93fc6e0c02fc3c7d792083780c747ef06e9e0e46e8bb7eb1'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-aarch64'; \ - sha256='2890aade218c145827521efb247b5765ac10ac5c46f21dddb2220c03c98d7f83'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-aarch64'; \ + sha256='bcc79aff65b35581246feca30d53261eddcfc79285868061b31f3ff86d102563'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-ppc64le'; \ - sha256='93560efd323f39fe86244b80cbe1ffeb2c16b169c72a3ae25535def98c04e744'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-ppc64le'; \ + sha256='a9de33aa3a306ee5a36d2d94e1dd88a5dea1330e774e27d1d7458d44c94d36f9'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-s390x'; \ - sha256='2a56c35df12d7a7ce9a9ae83426df36a612b0035ee36053912594d6f5a6ff356'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-s390x'; \ + sha256='429498246e1d4778669e781a70e659ba59fa8bb3cdee45f8ce8e01a716a12aff'; \ ;; \ *) echo >&2 "warning: unsupported compose architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 2cd0f11a5..f0f093d20 100644 --- a/versions.json +++ b/versions.json @@ -73,51 +73,51 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ed79398562f3a80a5d8c068fde14b0b12101e80b494aabb2b3533eaa10599e0f", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-x86_64" + "sha256": "184df811a70366fa339e99df38fc6ff24fc9e51b3388335efe51c1941377d4ce", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "2b5efc48e8359047cc280712f52e97be23fcb571b47b1e67ba6f56e971ac30f5", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv6" + "sha256": "a5fc14755a5de6c0998907a73b1eb115e3e45b80a05d284fecab2825a3722fca", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "727f67b78d6b1fbfed5de4d66869a691551f7341ad71504476d8a902e37588bb", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv7" + "sha256": "53ed781ff04efa2e93fc6e0c02fc3c7d792083780c747ef06e9e0e46e8bb7eb1", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "2890aade218c145827521efb247b5765ac10ac5c46f21dddb2220c03c98d7f83", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-aarch64" + "sha256": "bcc79aff65b35581246feca30d53261eddcfc79285868061b31f3ff86d102563", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "38c180a1a8c258173861c2adba99c4bd50510261d2d2407421174b096ed098f0", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-darwin-x86_64" + "sha256": "ca0b37356171633342dd7e87e9a1b3bad7133335b724ce8f574031388c0a816c", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "54a4003be4d1ae026a50766edd1531c9d9e5e5209e01957c4242199789b39187", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-darwin-aarch64" + "sha256": "bc603cb2f6d1a7dc9cde028163905238c14fc695b1a305326e316e1e8d1d6fea", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "93560efd323f39fe86244b80cbe1ffeb2c16b169c72a3ae25535def98c04e744", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-ppc64le" + "sha256": "a9de33aa3a306ee5a36d2d94e1dd88a5dea1330e774e27d1d7458d44c94d36f9", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-ppc64le" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2a56c35df12d7a7ce9a9ae83426df36a612b0035ee36053912594d6f5a6ff356", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-s390x" + "sha256": "429498246e1d4778669e781a70e659ba59fa8bb3cdee45f8ce8e01a716a12aff", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7e8231012d66c164cfbe46d17aec5f614a2ca4b0fc20dd78bd7b1b3fcbc4f28d", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-windows-x86_64.exe" + "sha256": "e8e0bb6a9c958711d081674ebe39fc31024e6de54fad18fe0b5471092745c440", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-windows-x86_64.exe" } }, - "version": "2.6.1" + "version": "2.7.0" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 5bda34eeb02386173b6e298cb4a983783efc7e8d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 20 Jul 2022 04:06:42 -0700 Subject: [PATCH 077/667] Update 22.06-rc to compose 2.7.0 --- 22.06-rc/Dockerfile | 26 +++++++++++++------------- versions.json | 38 +++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/22.06-rc/Dockerfile b/22.06-rc/Dockerfile index 43d7f033d..3be03030a 100644 --- a/22.06-rc/Dockerfile +++ b/22.06-rc/Dockerfile @@ -96,33 +96,33 @@ RUN set -eux; \ chmod +x "$plugin"; \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.6.1 +ENV DOCKER_COMPOSE_VERSION 2.7.0 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-x86_64'; \ - sha256='ed79398562f3a80a5d8c068fde14b0b12101e80b494aabb2b3533eaa10599e0f'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-x86_64'; \ + sha256='184df811a70366fa339e99df38fc6ff24fc9e51b3388335efe51c1941377d4ce'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv6'; \ - sha256='2b5efc48e8359047cc280712f52e97be23fcb571b47b1e67ba6f56e971ac30f5'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv6'; \ + sha256='a5fc14755a5de6c0998907a73b1eb115e3e45b80a05d284fecab2825a3722fca'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv7'; \ - sha256='727f67b78d6b1fbfed5de4d66869a691551f7341ad71504476d8a902e37588bb'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv7'; \ + sha256='53ed781ff04efa2e93fc6e0c02fc3c7d792083780c747ef06e9e0e46e8bb7eb1'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-aarch64'; \ - sha256='2890aade218c145827521efb247b5765ac10ac5c46f21dddb2220c03c98d7f83'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-aarch64'; \ + sha256='bcc79aff65b35581246feca30d53261eddcfc79285868061b31f3ff86d102563'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-ppc64le'; \ - sha256='93560efd323f39fe86244b80cbe1ffeb2c16b169c72a3ae25535def98c04e744'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-ppc64le'; \ + sha256='a9de33aa3a306ee5a36d2d94e1dd88a5dea1330e774e27d1d7458d44c94d36f9'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-s390x'; \ - sha256='2a56c35df12d7a7ce9a9ae83426df36a612b0035ee36053912594d6f5a6ff356'; \ + url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-s390x'; \ + sha256='429498246e1d4778669e781a70e659ba59fa8bb3cdee45f8ce8e01a716a12aff'; \ ;; \ *) echo >&2 "warning: unsupported compose architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index f0f093d20..62baa3dcc 100644 --- a/versions.json +++ b/versions.json @@ -206,51 +206,51 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ed79398562f3a80a5d8c068fde14b0b12101e80b494aabb2b3533eaa10599e0f", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-x86_64" + "sha256": "184df811a70366fa339e99df38fc6ff24fc9e51b3388335efe51c1941377d4ce", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "2b5efc48e8359047cc280712f52e97be23fcb571b47b1e67ba6f56e971ac30f5", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv6" + "sha256": "a5fc14755a5de6c0998907a73b1eb115e3e45b80a05d284fecab2825a3722fca", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "727f67b78d6b1fbfed5de4d66869a691551f7341ad71504476d8a902e37588bb", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-armv7" + "sha256": "53ed781ff04efa2e93fc6e0c02fc3c7d792083780c747ef06e9e0e46e8bb7eb1", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "2890aade218c145827521efb247b5765ac10ac5c46f21dddb2220c03c98d7f83", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-aarch64" + "sha256": "bcc79aff65b35581246feca30d53261eddcfc79285868061b31f3ff86d102563", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "38c180a1a8c258173861c2adba99c4bd50510261d2d2407421174b096ed098f0", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-darwin-x86_64" + "sha256": "ca0b37356171633342dd7e87e9a1b3bad7133335b724ce8f574031388c0a816c", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "54a4003be4d1ae026a50766edd1531c9d9e5e5209e01957c4242199789b39187", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-darwin-aarch64" + "sha256": "bc603cb2f6d1a7dc9cde028163905238c14fc695b1a305326e316e1e8d1d6fea", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "93560efd323f39fe86244b80cbe1ffeb2c16b169c72a3ae25535def98c04e744", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-ppc64le" + "sha256": "a9de33aa3a306ee5a36d2d94e1dd88a5dea1330e774e27d1d7458d44c94d36f9", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-ppc64le" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2a56c35df12d7a7ce9a9ae83426df36a612b0035ee36053912594d6f5a6ff356", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-linux-s390x" + "sha256": "429498246e1d4778669e781a70e659ba59fa8bb3cdee45f8ce8e01a716a12aff", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7e8231012d66c164cfbe46d17aec5f614a2ca4b0fc20dd78bd7b1b3fcbc4f28d", - "url": "https://github.com/docker/compose/releases/download/v2.6.1/docker-compose-windows-x86_64.exe" + "sha256": "e8e0bb6a9c958711d081674ebe39fc31024e6de54fad18fe0b5471092745c440", + "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-windows-x86_64.exe" } }, - "version": "2.6.1" + "version": "2.7.0" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From f23a2bea97f6d7ec563bc316302fb8edf620ec5b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 16 Jun 2022 13:54:29 -0700 Subject: [PATCH 078/667] Add explicit "cli" aliases and move "latest" to "dind" in 22.06+ --- 20.10/{ => cli}/Dockerfile | 0 20.10/{ => cli}/docker-entrypoint.sh | 0 20.10/{ => cli}/modprobe.sh | 0 20.10/dind/Dockerfile | 2 +- 20.10/git/Dockerfile | 2 +- 22.06-rc/{ => cli}/Dockerfile | 0 22.06-rc/{ => cli}/docker-entrypoint.sh | 0 22.06-rc/{ => cli}/modprobe.sh | 0 22.06-rc/dind/Dockerfile | 2 +- 22.06-rc/git/Dockerfile | 2 +- ...erfile.template => Dockerfile-cli.template | 0 Dockerfile-dind.template | 2 +- Dockerfile-git.template | 2 +- apply-templates.sh | 8 +++--- generate-stackbrew-library.sh | 26 ++++++++++++++----- versions.json | 4 +-- versions.sh | 2 +- 17 files changed, 33 insertions(+), 19 deletions(-) rename 20.10/{ => cli}/Dockerfile (100%) rename 20.10/{ => cli}/docker-entrypoint.sh (100%) rename 20.10/{ => cli}/modprobe.sh (100%) rename 22.06-rc/{ => cli}/Dockerfile (100%) rename 22.06-rc/{ => cli}/docker-entrypoint.sh (100%) rename 22.06-rc/{ => cli}/modprobe.sh (100%) rename Dockerfile.template => Dockerfile-cli.template (100%) diff --git a/20.10/Dockerfile b/20.10/cli/Dockerfile similarity index 100% rename from 20.10/Dockerfile rename to 20.10/cli/Dockerfile diff --git a/20.10/docker-entrypoint.sh b/20.10/cli/docker-entrypoint.sh similarity index 100% rename from 20.10/docker-entrypoint.sh rename to 20.10/cli/docker-entrypoint.sh diff --git a/20.10/modprobe.sh b/20.10/cli/modprobe.sh similarity index 100% rename from 20.10/modprobe.sh rename to 20.10/cli/modprobe.sh diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index b319a2b06..8103651d9 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:20.10 +FROM docker:20.10-cli # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies RUN set -eux; \ diff --git a/20.10/git/Dockerfile b/20.10/git/Dockerfile index d23654fd2..8851cd7b0 100644 --- a/20.10/git/Dockerfile +++ b/20.10/git/Dockerfile @@ -4,6 +4,6 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:20.10 +FROM docker:20.10-cli RUN apk add --no-cache git diff --git a/22.06-rc/Dockerfile b/22.06-rc/cli/Dockerfile similarity index 100% rename from 22.06-rc/Dockerfile rename to 22.06-rc/cli/Dockerfile diff --git a/22.06-rc/docker-entrypoint.sh b/22.06-rc/cli/docker-entrypoint.sh similarity index 100% rename from 22.06-rc/docker-entrypoint.sh rename to 22.06-rc/cli/docker-entrypoint.sh diff --git a/22.06-rc/modprobe.sh b/22.06-rc/cli/modprobe.sh similarity index 100% rename from 22.06-rc/modprobe.sh rename to 22.06-rc/cli/modprobe.sh diff --git a/22.06-rc/dind/Dockerfile b/22.06-rc/dind/Dockerfile index 8b64f8e00..3af3e8eb1 100644 --- a/22.06-rc/dind/Dockerfile +++ b/22.06-rc/dind/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:22.06-rc +FROM docker:22.06-rc-cli # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies RUN set -eux; \ diff --git a/22.06-rc/git/Dockerfile b/22.06-rc/git/Dockerfile index 52b3e92af..632854d75 100644 --- a/22.06-rc/git/Dockerfile +++ b/22.06-rc/git/Dockerfile @@ -4,6 +4,6 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:22.06-rc +FROM docker:22.06-rc-cli RUN apk add --no-cache git diff --git a/Dockerfile.template b/Dockerfile-cli.template similarity index 100% rename from Dockerfile.template rename to Dockerfile-cli.template diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 668215964..ba7add213 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -1,4 +1,4 @@ -FROM docker:{{ env.version }} +FROM docker:{{ env.version }}-cli # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies RUN set -eux; \ diff --git a/Dockerfile-git.template b/Dockerfile-git.template index 0bf1a1ce4..40606acc2 100644 --- a/Dockerfile-git.template +++ b/Dockerfile-git.template @@ -1,3 +1,3 @@ -FROM docker:{{ env.version }} +FROM docker:{{ env.version }}-cli RUN apk add --no-cache git diff --git a/apply-templates.sh b/apply-templates.sh index e74505a94..706c4adec 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -36,11 +36,13 @@ for version; do continue fi + rm -rf "$version" + variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)" eval "variants=( $variants )" for variant in "${variants[@]}"; do - dir="$version${variant:+/$variant}" + dir="$version/$variant" case "$variant" in windows/*) @@ -53,7 +55,7 @@ for version; do ;; *) - template="Dockerfile${variant:+-$variant}.template" + template="Dockerfile-$variant.template" ;; esac @@ -64,6 +66,6 @@ for version; do } > "$dir/Dockerfile" done - cp -a docker-entrypoint.sh modprobe.sh "$version/" + cp -a docker-entrypoint.sh modprobe.sh "$version/cli/" cp -a dockerd-entrypoint.sh "$version/dind/" done diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a205d0eb0..a54c64643 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,5 +1,5 @@ -#!/bin/bash -set -eu +#!/usr/bin/env bash +set -Eeuo pipefail self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" @@ -72,7 +72,7 @@ versionArches() { fi local parent parentArches - parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")" + parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/cli/Dockerfile")" parentArches="${parentRepoToArches[$parent]:-}" comm -12 \ @@ -157,23 +157,35 @@ for version; do variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)" eval "variants=( $variants )" + case "$rcVersion" in + 20.10) latestVariant='cli' ;; + *) latestVariant='dind' ;; + esac + for v in "${variants[@]}"; do - dir="$version${v:+/$v}" + dir="$version/$v" [ -f "$dir/Dockerfile" ] || continue commit="$(dirCommit "$dir")" variant="$(basename "$v")" - variantAliases=( "${versionAliases[@]/%/${variant:+-$variant}}" ) + variantAliases=( "${versionAliases[@]/%/-$variant}" ) variantAliases=( "${variantAliases[@]//latest-/}" ) - if [ "$variant" = '' ] || [ "$variant" = 'dind' ]; then - parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/Dockerfile")" + if [ "$variant" = 'cli' ] || [ "$variant" = 'dind' ]; then + parent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/cli/Dockerfile")" alpine="${parent#*:}" # "3.14" suiteAliases=( "${variantAliases[0]}" ) # only "X.Y.Z-foo" suiteAliases=( "${suiteAliases[@]/%/-alpine$alpine}" ) suiteAliases=( "${suiteAliases[@]//latest-/}" ) variantAliases+=( "${suiteAliases[@]}" ) + if [ "$variant" = "$latestVariant" ]; then + # add "latest" aliases + suiteAliases=( "${versionAliases[0]}" ) # only "X.Y.Z-foo" + suiteAliases=( "${suiteAliases[@]/%/-alpine$alpine}" ) + suiteAliases=( "${suiteAliases[@]//latest-/}" ) + variantAliases+=( "${versionAliases[@]}" "${suiteAliases[@]}" ) + fi fi sharedTags=() diff --git a/versions.json b/versions.json index 62baa3dcc..a203d05e1 100644 --- a/versions.json +++ b/versions.json @@ -121,7 +121,7 @@ }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ - "", + "cli", "dind", "dind-rootless", "git", @@ -254,7 +254,7 @@ }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ - "", + "cli", "dind", "dind-rootless", "git", diff --git a/versions.sh b/versions.sh index 61969cea5..a5ab0551c 100755 --- a/versions.sh +++ b/versions.sh @@ -250,7 +250,7 @@ for version in "${versions[@]}"; do # order here controls the order of the library/ file for variant in \ - '' \ + cli \ dind \ dind-rootless \ git \ From 1f37025ef2b9b70706d8e11cc3552830e4524758 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 8 Jul 2022 12:08:54 -0700 Subject: [PATCH 079/667] Only include the CLI in the CLI variants (finally, as was intended all along) --- 20.10/cli/Dockerfile | 32 ++++++----- 20.10/dind-rootless/Dockerfile | 4 +- 20.10/dind/Dockerfile | 36 +++++++++++++ 22.06-rc/cli/Dockerfile | 32 ++++++----- 22.06-rc/dind-rootless/Dockerfile | 4 +- 22.06-rc/dind/Dockerfile | 36 +++++++++++++ Dockerfile-cli.template | 88 +++++++++---------------------- Dockerfile-dind-rootless.template | 39 ++++---------- Dockerfile-dind.template | 27 ++++++++++ shared.jq | 67 +++++++++++++++++++++++ 10 files changed, 243 insertions(+), 122 deletions(-) create mode 100644 shared.jq diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index cae822625..67aacbcaa 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -20,9 +20,6 @@ RUN apk add --no-cache \ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf ENV DOCKER_VERSION 20.10.17 -# 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) RUN set -eux; \ \ @@ -40,23 +37,25 @@ RUN set -eux; \ 'aarch64') \ url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.17.tgz'; \ ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ \ - wget -O docker.tgz "$url"; \ + wget -O 'docker.tgz' "$url"; \ \ tar --extract \ --file docker.tgz \ --strip-components 1 \ --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ ; \ rm docker.tgz; \ \ - dockerd --version; \ docker --version ENV DOCKER_BUILDX_VERSION 0.8.2 RUN set -eux; \ + \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ @@ -87,17 +86,22 @@ RUN set -eux; \ url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x'; \ sha256='ec4bb6f271f38dca5a377a70be24ee2108a85f6e6ba511ad3b805c4f1602a0d2'; \ ;; \ - *) echo >&2 "warning: unsupported buildx architecture ($apkArch); skipping"; exit 0 ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ plugin='/usr/libexec/docker/cli-plugins/docker-buildx'; \ mkdir -p "$(dirname "$plugin")"; \ - wget -O "$plugin" "$url"; \ - echo "$sha256 *$plugin" | sha256sum -c -; \ + mv -vT 'docker-buildx' "$plugin"; \ chmod +x "$plugin"; \ + \ docker buildx version ENV DOCKER_COMPOSE_VERSION 2.7.0 RUN set -eux; \ + \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ @@ -124,13 +128,17 @@ RUN set -eux; \ url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-s390x'; \ sha256='429498246e1d4778669e781a70e659ba59fa8bb3cdee45f8ce8e01a716a12aff'; \ ;; \ - *) echo >&2 "warning: unsupported compose architecture ($apkArch); skipping"; exit 0 ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ plugin='/usr/libexec/docker/cli-plugins/docker-compose'; \ mkdir -p "$(dirname "$plugin")"; \ - wget -O "$plugin" "$url"; \ - echo "$sha256 *$plugin" | sha256sum -c -; \ + mv -vT 'docker-compose' "$plugin"; \ chmod +x "$plugin"; \ + \ ln -sv "$plugin" /usr/local/bin/; \ docker-compose --version; \ docker compose version diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index d56c683c3..725ef2f75 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -29,10 +29,10 @@ RUN set -eux; \ 'aarch64') \ url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.17.tgz'; \ ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ \ - wget -O rootless.tgz "$url"; \ + wget -O 'rootless.tgz' "$url"; \ \ tar --extract \ --file rootless.tgz \ diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index 8103651d9..ac2295a9e 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/Dockerfile @@ -37,6 +37,42 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subuid; \ echo 'dockremap:165536:65536' >> /etc/subgid +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.17.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.17.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.17.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:20.10-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + # https://github.com/docker/docker/tree/master/hack/dind ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 3be03030a..59fac85e4 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -20,9 +20,6 @@ RUN apk add --no-cache \ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf ENV DOCKER_VERSION 22.06.0-beta.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) RUN set -eux; \ \ @@ -40,23 +37,25 @@ RUN set -eux; \ 'aarch64') \ url='https://download.docker.com/linux/static/test/aarch64/docker-22.06.0-beta.0.tgz'; \ ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ \ - wget -O docker.tgz "$url"; \ + wget -O 'docker.tgz' "$url"; \ \ tar --extract \ --file docker.tgz \ --strip-components 1 \ --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ ; \ rm docker.tgz; \ \ - dockerd --version; \ docker --version ENV DOCKER_BUILDX_VERSION 0.8.2 RUN set -eux; \ + \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ @@ -87,17 +86,22 @@ RUN set -eux; \ url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x'; \ sha256='ec4bb6f271f38dca5a377a70be24ee2108a85f6e6ba511ad3b805c4f1602a0d2'; \ ;; \ - *) echo >&2 "warning: unsupported buildx architecture ($apkArch); skipping"; exit 0 ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ plugin='/usr/libexec/docker/cli-plugins/docker-buildx'; \ mkdir -p "$(dirname "$plugin")"; \ - wget -O "$plugin" "$url"; \ - echo "$sha256 *$plugin" | sha256sum -c -; \ + mv -vT 'docker-buildx' "$plugin"; \ chmod +x "$plugin"; \ + \ docker buildx version ENV DOCKER_COMPOSE_VERSION 2.7.0 RUN set -eux; \ + \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ @@ -124,13 +128,17 @@ RUN set -eux; \ url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-s390x'; \ sha256='429498246e1d4778669e781a70e659ba59fa8bb3cdee45f8ce8e01a716a12aff'; \ ;; \ - *) echo >&2 "warning: unsupported compose architecture ($apkArch); skipping"; exit 0 ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ plugin='/usr/libexec/docker/cli-plugins/docker-compose'; \ mkdir -p "$(dirname "$plugin")"; \ - wget -O "$plugin" "$url"; \ - echo "$sha256 *$plugin" | sha256sum -c -; \ + mv -vT 'docker-compose' "$plugin"; \ chmod +x "$plugin"; \ + \ ln -sv "$plugin" /usr/local/bin/; \ docker-compose --version; \ docker compose version diff --git a/22.06-rc/dind-rootless/Dockerfile b/22.06-rc/dind-rootless/Dockerfile index c867d9bf7..60f376b43 100644 --- a/22.06-rc/dind-rootless/Dockerfile +++ b/22.06-rc/dind-rootless/Dockerfile @@ -29,10 +29,10 @@ RUN set -eux; \ 'aarch64') \ url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-22.06.0-beta.0.tgz'; \ ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ \ - wget -O rootless.tgz "$url"; \ + wget -O 'rootless.tgz' "$url"; \ \ tar --extract \ --file rootless.tgz \ diff --git a/22.06-rc/dind/Dockerfile b/22.06-rc/dind/Dockerfile index 3af3e8eb1..a3cd746e6 100644 --- a/22.06-rc/dind/Dockerfile +++ b/22.06-rc/dind/Dockerfile @@ -37,6 +37,42 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subuid; \ echo 'dockremap:165536:65536' >> /etc/subgid +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-22.06.0-beta.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-22.06.0-beta.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-22.06.0-beta.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-22.06.0-beta.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:22.06-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + # https://github.com/docker/docker/tree/master/hack/dind ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index c0d8ce3ad..64d7afd97 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -1,3 +1,4 @@ +{{ include "shared" -}} FROM alpine:3.16 RUN apk add --no-cache \ @@ -14,59 +15,27 @@ RUN apk add --no-cache \ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf ENV DOCKER_VERSION {{ .version }} -# 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) -{{ - def apkArch: - { - # https://dl-cdn.alpinelinux.org/alpine/edge/main/ - # https://wiki.alpinelinux.org/wiki/Architecture#Alpine_Hardware_Architecture_.28.22arch.22.29_Support - # https://pkgs.alpinelinux.org/packages ("Arch" dropdown) - amd64: "x86_64", - arm32v6: "armhf", - arm32v7: "armv7", - arm64v8: "aarch64", - i386: "x86", - ppc64le: "ppc64le", - riscv64: "riscv64", - s390x: "s390x", - }[.] --}} RUN set -eux; \ \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ -{{ - [ - .arches | to_entries[] - | .key as $bashbrewArch - | ($bashbrewArch | apkArch) as $apkArch - | .value - | select($apkArch and .dockerUrl) - | ( --}} - {{ $apkArch | @sh }}) \ - url={{ .dockerUrl | @sh }}; \ - ;; \ -{{ - ) - ] | add --}} - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O docker.tgz "$url"; \ + {{ + download({ + arches: .arches, + urlKey: "dockerUrl", + # TODO sha256Key (once Docker publishes them 😭) + target: "docker.tgz", + }) + }}; \ \ tar --extract \ --file docker.tgz \ --strip-components 1 \ --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ ; \ rm docker.tgz; \ \ - dockerd --version; \ docker --version {{ { @@ -79,31 +48,22 @@ RUN set -eux; \ ENV DOCKER_{{ $key | ascii_upcase }}_VERSION {{ .version }} RUN set -eux; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ -{{ - .arches | to_entries | map( - .key as $bashbrewArch - | ($bashbrewArch | apkArch) as $apkArch - | .value - | select($apkArch and .url and .sha256) - | ( --}} - {{ $apkArch | @sh }}) \ - url={{ .url | @sh }}; \ - sha256={{ .sha256 | @sh }}; \ - ;; \ -{{ - ) - ) | add --}} - *) echo >&2 "warning: unsupported {{ $key }} architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ + \ + {{ + download({ + arches: .arches, + urlKey: "url", + sha256Key: "sha256", + target: ("docker-" + $key), + missingArchWarning: true, + }) + }}; \ + \ plugin='/usr/libexec/docker/cli-plugins/docker-{{ $key }}'; \ mkdir -p "$(dirname "$plugin")"; \ - wget -O "$plugin" "$url"; \ - echo "$sha256 *$plugin" | sha256sum -c -; \ + mv -vT {{ "docker-" + $key | @sh }} "$plugin"; \ chmod +x "$plugin"; \ + \ {{ if $key == "compose" then ( -}} ln -sv "$plugin" /usr/local/bin/; \ docker-{{ $key }} --version; \ diff --git a/Dockerfile-dind-rootless.template b/Dockerfile-dind-rootless.template index 896fb8dac..3d9c76782 100644 --- a/Dockerfile-dind-rootless.template +++ b/Dockerfile-dind-rootless.template @@ -1,3 +1,4 @@ +{{ include "shared" -}} FROM docker:{{ env.version }}-dind # busybox "ip" is insufficient: @@ -15,36 +16,14 @@ RUN set -eux; \ RUN set -eux; \ \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ -{{ - [ - .arches | to_entries[] - | select(.value.rootlessExtrasUrl) - | .key as $bashbrewArch - | ( - { - amd64: "x86_64", - arm32v6: "armhf", - arm32v7: "armv7", - arm64v8: "aarch64", - } - | .[$bashbrewArch] // $bashbrewArch - ) as $apkArch - | .value - | ( --}} - {{ $apkArch | @sh }}) \ - url={{ .rootlessExtrasUrl | @sh }}; \ - ;; \ -{{ - ) - ] | add --}} - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O rootless.tgz "$url"; \ + {{ + download({ + arches: .arches, + urlKey: "rootlessExtrasUrl", + # TODO sha256Key (once Docker publishes them 😭) + target: "rootless.tgz", + }) + }}; \ \ tar --extract \ --file rootless.tgz \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index ba7add213..f8b585328 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -1,3 +1,4 @@ +{{ include "shared" -}} FROM docker:{{ env.version }}-cli # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies @@ -31,6 +32,32 @@ RUN set -eux; \ echo 'dockremap:165536:65536' >> /etc/subuid; \ echo 'dockremap:165536:65536' >> /etc/subgid +RUN set -eux; \ + \ + {{ + download({ + arches: .arches, + urlKey: "dockerUrl", + # TODO sha256Key (once Docker publishes them 😭) + target: "docker.tgz", + }) + }}; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:{{ env.version }}-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + # https://github.com/docker/docker/tree/master/hack/dind ENV DIND_COMMIT {{ .dindCommit }} diff --git a/shared.jq b/shared.jq new file mode 100644 index 000000000..c3213117e --- /dev/null +++ b/shared.jq @@ -0,0 +1,67 @@ +# converts a bashbrew architecture to apk's strings +def apkArch: + { + # https://dl-cdn.alpinelinux.org/alpine/edge/main/ + # https://wiki.alpinelinux.org/wiki/Architecture#Alpine_Hardware_Architecture_.28.22arch.22.29_Support + # https://pkgs.alpinelinux.org/packages ("Arch" dropdown) + amd64: "x86_64", + arm32v6: "armhf", + arm32v7: "armv7", + arm64v8: "aarch64", + i386: "x86", + ppc64le: "ppc64le", + riscv64: "riscv64", + s390x: "s390x", + }[.] + ; + +# RUN set -eux; \ +# ... +# {{ +# download({ +# arches: .arches, +# urlKey: "dockerUrl", +# #sha256Key: "sha256", +# target: "docker.tgz", +# #missingArchWarning: true, +# }) +# }}; \ +# ... +def download(opts): + (opts.sha256Key | not) as $notSha256 + | [ + "apkArch=\"$(apk --print-arch)\"; + case \"$apkArch\" in" + , + ( + opts.arches | to_entries[] + | .key as $bashbrewArch + | ($bashbrewArch | apkArch) as $apkArch + | .value + | .[opts.urlKey] as $url + | (if $notSha256 then "none" else .[opts.sha256Key] end) as $sha256 + | select($apkArch and $url and $sha256) + | (" + \($apkArch | @sh)) + url=\($url | @sh);" + + if $notSha256 then "" else " + sha256=\($sha256 | @sh);" + end + " + ;;" + ) + ) + , + " + *) echo >&2 \"\(if opts.missingArchWarning then "warning" else "error" end): unsupported \(opts.target | @sh) architecture ($apkArch)\(if opts.missingArchWarning then "; skipping" else "" end)\"; exit \(if opts.missingArchWarning then 0 else 1 end) ;; + esac; + + wget -O \(opts.target | @sh) \"$url\";" + , + if $notSha256 then "" else " + echo \"$sha256 *\"\(opts.target | @sh) | sha256sum -c -;" + end + ] | add + | rtrimstr(";") + | gsub("(?<=[^[:space:]])\n"; " \\\n") + | gsub("(?<=[[:space:]])\n"; "\\\n") + ; From fb39a14578b776eecbad770400b5f9730aa94f14 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 29 Jul 2022 16:04:16 -0700 Subject: [PATCH 080/667] Update 20.10 to compose 2.8.0 --- 20.10/cli/Dockerfile | 26 +++++++++++++------------- versions.json | 38 +++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 67aacbcaa..cd2bae3bd 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,34 +99,34 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.7.0 +ENV DOCKER_COMPOSE_VERSION 2.8.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-x86_64'; \ - sha256='184df811a70366fa339e99df38fc6ff24fc9e51b3388335efe51c1941377d4ce'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-x86_64'; \ + sha256='e16838a28c297644908820c2fd8e7750f674603d2f1be7ffc1fc8870fdd3fec7'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv6'; \ - sha256='a5fc14755a5de6c0998907a73b1eb115e3e45b80a05d284fecab2825a3722fca'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv6'; \ + sha256='49fb1fe211c154b49f735e5eca812f7f1394a71f0962def84fc9ff0991acfd19'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv7'; \ - sha256='53ed781ff04efa2e93fc6e0c02fc3c7d792083780c747ef06e9e0e46e8bb7eb1'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv7'; \ + sha256='6cfa4331a47c69336ef81f4295a85392fe892f54d186a71c5f79117ecea9359b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-aarch64'; \ - sha256='bcc79aff65b35581246feca30d53261eddcfc79285868061b31f3ff86d102563'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-aarch64'; \ + sha256='74170a438753371968e6211a6f13db6e311b248ba1f952b203798a3dcfb69e33'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-ppc64le'; \ - sha256='a9de33aa3a306ee5a36d2d94e1dd88a5dea1330e774e27d1d7458d44c94d36f9'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-ppc64le'; \ + sha256='a936fd97515fc88ca2859b54b94d30b17abe30ffee37833ed39163512444a15e'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-s390x'; \ - sha256='429498246e1d4778669e781a70e659ba59fa8bb3cdee45f8ce8e01a716a12aff'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-s390x'; \ + sha256='4831f1fda024e34947cdace9ea7e4988e9067e21b9cf6626b630bf3bee8c87ee'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index a203d05e1..8a37dec56 100644 --- a/versions.json +++ b/versions.json @@ -73,51 +73,51 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "184df811a70366fa339e99df38fc6ff24fc9e51b3388335efe51c1941377d4ce", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-x86_64" + "sha256": "e16838a28c297644908820c2fd8e7750f674603d2f1be7ffc1fc8870fdd3fec7", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a5fc14755a5de6c0998907a73b1eb115e3e45b80a05d284fecab2825a3722fca", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv6" + "sha256": "49fb1fe211c154b49f735e5eca812f7f1394a71f0962def84fc9ff0991acfd19", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "53ed781ff04efa2e93fc6e0c02fc3c7d792083780c747ef06e9e0e46e8bb7eb1", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv7" + "sha256": "6cfa4331a47c69336ef81f4295a85392fe892f54d186a71c5f79117ecea9359b", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "bcc79aff65b35581246feca30d53261eddcfc79285868061b31f3ff86d102563", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-aarch64" + "sha256": "74170a438753371968e6211a6f13db6e311b248ba1f952b203798a3dcfb69e33", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "ca0b37356171633342dd7e87e9a1b3bad7133335b724ce8f574031388c0a816c", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-darwin-x86_64" + "sha256": "e037360b86a37dddc9c47abe58589b8975784ea8c5cd95d9418de9a79e10475a", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "bc603cb2f6d1a7dc9cde028163905238c14fc695b1a305326e316e1e8d1d6fea", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-darwin-aarch64" + "sha256": "6482d7a684ea82e6590109ebf8f97573d87f312f36151830d0f8ea121c30e166", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "a9de33aa3a306ee5a36d2d94e1dd88a5dea1330e774e27d1d7458d44c94d36f9", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-ppc64le" + "sha256": "a936fd97515fc88ca2859b54b94d30b17abe30ffee37833ed39163512444a15e", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-ppc64le" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "429498246e1d4778669e781a70e659ba59fa8bb3cdee45f8ce8e01a716a12aff", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-s390x" + "sha256": "4831f1fda024e34947cdace9ea7e4988e9067e21b9cf6626b630bf3bee8c87ee", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e8e0bb6a9c958711d081674ebe39fc31024e6de54fad18fe0b5471092745c440", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-windows-x86_64.exe" + "sha256": "8ce1efe39658c34c924f4f6012614a26e5431d6506d6ceb3f8c9a9f3754e3656", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-windows-x86_64.exe" } }, - "version": "2.7.0" + "version": "2.8.0" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 274f65c8963fa58a2d0e67da614b8689be3eac17 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 29 Jul 2022 22:04:27 -0700 Subject: [PATCH 081/667] Update 22.06-rc to compose 2.8.0 --- 22.06-rc/cli/Dockerfile | 26 +++++++++++++------------- versions.json | 38 +++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 59fac85e4..03f3df9e4 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,34 +99,34 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.7.0 +ENV DOCKER_COMPOSE_VERSION 2.8.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-x86_64'; \ - sha256='184df811a70366fa339e99df38fc6ff24fc9e51b3388335efe51c1941377d4ce'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-x86_64'; \ + sha256='e16838a28c297644908820c2fd8e7750f674603d2f1be7ffc1fc8870fdd3fec7'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv6'; \ - sha256='a5fc14755a5de6c0998907a73b1eb115e3e45b80a05d284fecab2825a3722fca'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv6'; \ + sha256='49fb1fe211c154b49f735e5eca812f7f1394a71f0962def84fc9ff0991acfd19'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv7'; \ - sha256='53ed781ff04efa2e93fc6e0c02fc3c7d792083780c747ef06e9e0e46e8bb7eb1'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv7'; \ + sha256='6cfa4331a47c69336ef81f4295a85392fe892f54d186a71c5f79117ecea9359b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-aarch64'; \ - sha256='bcc79aff65b35581246feca30d53261eddcfc79285868061b31f3ff86d102563'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-aarch64'; \ + sha256='74170a438753371968e6211a6f13db6e311b248ba1f952b203798a3dcfb69e33'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-ppc64le'; \ - sha256='a9de33aa3a306ee5a36d2d94e1dd88a5dea1330e774e27d1d7458d44c94d36f9'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-ppc64le'; \ + sha256='a936fd97515fc88ca2859b54b94d30b17abe30ffee37833ed39163512444a15e'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-s390x'; \ - sha256='429498246e1d4778669e781a70e659ba59fa8bb3cdee45f8ce8e01a716a12aff'; \ + url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-s390x'; \ + sha256='4831f1fda024e34947cdace9ea7e4988e9067e21b9cf6626b630bf3bee8c87ee'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 8a37dec56..513f9e106 100644 --- a/versions.json +++ b/versions.json @@ -206,51 +206,51 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "184df811a70366fa339e99df38fc6ff24fc9e51b3388335efe51c1941377d4ce", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-x86_64" + "sha256": "e16838a28c297644908820c2fd8e7750f674603d2f1be7ffc1fc8870fdd3fec7", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a5fc14755a5de6c0998907a73b1eb115e3e45b80a05d284fecab2825a3722fca", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv6" + "sha256": "49fb1fe211c154b49f735e5eca812f7f1394a71f0962def84fc9ff0991acfd19", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "53ed781ff04efa2e93fc6e0c02fc3c7d792083780c747ef06e9e0e46e8bb7eb1", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-armv7" + "sha256": "6cfa4331a47c69336ef81f4295a85392fe892f54d186a71c5f79117ecea9359b", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "bcc79aff65b35581246feca30d53261eddcfc79285868061b31f3ff86d102563", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-aarch64" + "sha256": "74170a438753371968e6211a6f13db6e311b248ba1f952b203798a3dcfb69e33", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "ca0b37356171633342dd7e87e9a1b3bad7133335b724ce8f574031388c0a816c", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-darwin-x86_64" + "sha256": "e037360b86a37dddc9c47abe58589b8975784ea8c5cd95d9418de9a79e10475a", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "bc603cb2f6d1a7dc9cde028163905238c14fc695b1a305326e316e1e8d1d6fea", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-darwin-aarch64" + "sha256": "6482d7a684ea82e6590109ebf8f97573d87f312f36151830d0f8ea121c30e166", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "a9de33aa3a306ee5a36d2d94e1dd88a5dea1330e774e27d1d7458d44c94d36f9", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-ppc64le" + "sha256": "a936fd97515fc88ca2859b54b94d30b17abe30ffee37833ed39163512444a15e", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-ppc64le" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "429498246e1d4778669e781a70e659ba59fa8bb3cdee45f8ce8e01a716a12aff", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-linux-s390x" + "sha256": "4831f1fda024e34947cdace9ea7e4988e9067e21b9cf6626b630bf3bee8c87ee", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e8e0bb6a9c958711d081674ebe39fc31024e6de54fad18fe0b5471092745c440", - "url": "https://github.com/docker/compose/releases/download/v2.7.0/docker-compose-windows-x86_64.exe" + "sha256": "8ce1efe39658c34c924f4f6012614a26e5431d6506d6ceb3f8c9a9f3754e3656", + "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-windows-x86_64.exe" } }, - "version": "2.7.0" + "version": "2.8.0" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 8ddb44b5fbeb13cc6d0b810976460f50538fdafb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 1 Aug 2022 10:04:17 -0700 Subject: [PATCH 082/667] Update 20.10 to compose 2.9.0 --- 20.10/cli/Dockerfile | 26 +++++++++++++------------- versions.json | 38 +++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index cd2bae3bd..ad0f2f1f8 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,34 +99,34 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.8.0 +ENV DOCKER_COMPOSE_VERSION 2.9.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-x86_64'; \ - sha256='e16838a28c297644908820c2fd8e7750f674603d2f1be7ffc1fc8870fdd3fec7'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-x86_64'; \ + sha256='3be9ce88ecba41b734e3fc8e59a9b11531133761414a78827d1615aadb5ef1f5'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv6'; \ - sha256='49fb1fe211c154b49f735e5eca812f7f1394a71f0962def84fc9ff0991acfd19'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv6'; \ + sha256='2ea0f36350f81ae66db2b8c12104de6ed974a328557a4967857ee6e8df4b8f26'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv7'; \ - sha256='6cfa4331a47c69336ef81f4295a85392fe892f54d186a71c5f79117ecea9359b'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv7'; \ + sha256='658db542e40c8063cdafc23f650493bedc10b41b6d6fb581b7866bfeb5ffb0ba'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-aarch64'; \ - sha256='74170a438753371968e6211a6f13db6e311b248ba1f952b203798a3dcfb69e33'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-aarch64'; \ + sha256='6d227b060b2bc3dc5f315a07ae4f647f042755691e2da905b1a21e60a8ae3ddf'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-ppc64le'; \ - sha256='a936fd97515fc88ca2859b54b94d30b17abe30ffee37833ed39163512444a15e'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-ppc64le'; \ + sha256='101ea490283f3c862e9bb4e7ef2a3fb38393cf2139f2b78e7a7423c91ad0c1fa'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-s390x'; \ - sha256='4831f1fda024e34947cdace9ea7e4988e9067e21b9cf6626b630bf3bee8c87ee'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-s390x'; \ + sha256='0826c101e1d1a070e8ab8d7649c0da3cb9e6ecf1e717c545188243be6e676d00'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 513f9e106..92d31a554 100644 --- a/versions.json +++ b/versions.json @@ -73,51 +73,51 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e16838a28c297644908820c2fd8e7750f674603d2f1be7ffc1fc8870fdd3fec7", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-x86_64" + "sha256": "3be9ce88ecba41b734e3fc8e59a9b11531133761414a78827d1615aadb5ef1f5", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "49fb1fe211c154b49f735e5eca812f7f1394a71f0962def84fc9ff0991acfd19", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv6" + "sha256": "2ea0f36350f81ae66db2b8c12104de6ed974a328557a4967857ee6e8df4b8f26", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "6cfa4331a47c69336ef81f4295a85392fe892f54d186a71c5f79117ecea9359b", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv7" + "sha256": "658db542e40c8063cdafc23f650493bedc10b41b6d6fb581b7866bfeb5ffb0ba", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "74170a438753371968e6211a6f13db6e311b248ba1f952b203798a3dcfb69e33", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-aarch64" + "sha256": "6d227b060b2bc3dc5f315a07ae4f647f042755691e2da905b1a21e60a8ae3ddf", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "e037360b86a37dddc9c47abe58589b8975784ea8c5cd95d9418de9a79e10475a", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-darwin-x86_64" + "sha256": "e1f2d97ae17854771836512761ec24c1ea400b954183f6dbb21d6d6a094e1769", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "6482d7a684ea82e6590109ebf8f97573d87f312f36151830d0f8ea121c30e166", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-darwin-aarch64" + "sha256": "f490009fb9f100d9a75fd836c50277b7989e16536e596696153e118d7efa2c50", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "a936fd97515fc88ca2859b54b94d30b17abe30ffee37833ed39163512444a15e", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-ppc64le" + "sha256": "101ea490283f3c862e9bb4e7ef2a3fb38393cf2139f2b78e7a7423c91ad0c1fa", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-ppc64le" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "4831f1fda024e34947cdace9ea7e4988e9067e21b9cf6626b630bf3bee8c87ee", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-s390x" + "sha256": "0826c101e1d1a070e8ab8d7649c0da3cb9e6ecf1e717c545188243be6e676d00", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "8ce1efe39658c34c924f4f6012614a26e5431d6506d6ceb3f8c9a9f3754e3656", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-windows-x86_64.exe" + "sha256": "d362372e2e46368f16702c192b12e7e349965d3b7d01c5fbb07504a9db732e88", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-windows-x86_64.exe" } }, - "version": "2.8.0" + "version": "2.9.0" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From fd4039323bbf96d9cf7b8f18a38c3b9b9a9e2189 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 1 Aug 2022 10:06:35 -0700 Subject: [PATCH 083/667] Update 22.06-rc to compose 2.9.0 --- 22.06-rc/cli/Dockerfile | 26 +++++++++++++------------- versions.json | 38 +++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 03f3df9e4..233a21e63 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,34 +99,34 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.8.0 +ENV DOCKER_COMPOSE_VERSION 2.9.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-x86_64'; \ - sha256='e16838a28c297644908820c2fd8e7750f674603d2f1be7ffc1fc8870fdd3fec7'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-x86_64'; \ + sha256='3be9ce88ecba41b734e3fc8e59a9b11531133761414a78827d1615aadb5ef1f5'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv6'; \ - sha256='49fb1fe211c154b49f735e5eca812f7f1394a71f0962def84fc9ff0991acfd19'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv6'; \ + sha256='2ea0f36350f81ae66db2b8c12104de6ed974a328557a4967857ee6e8df4b8f26'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv7'; \ - sha256='6cfa4331a47c69336ef81f4295a85392fe892f54d186a71c5f79117ecea9359b'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv7'; \ + sha256='658db542e40c8063cdafc23f650493bedc10b41b6d6fb581b7866bfeb5ffb0ba'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-aarch64'; \ - sha256='74170a438753371968e6211a6f13db6e311b248ba1f952b203798a3dcfb69e33'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-aarch64'; \ + sha256='6d227b060b2bc3dc5f315a07ae4f647f042755691e2da905b1a21e60a8ae3ddf'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-ppc64le'; \ - sha256='a936fd97515fc88ca2859b54b94d30b17abe30ffee37833ed39163512444a15e'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-ppc64le'; \ + sha256='101ea490283f3c862e9bb4e7ef2a3fb38393cf2139f2b78e7a7423c91ad0c1fa'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-s390x'; \ - sha256='4831f1fda024e34947cdace9ea7e4988e9067e21b9cf6626b630bf3bee8c87ee'; \ + url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-s390x'; \ + sha256='0826c101e1d1a070e8ab8d7649c0da3cb9e6ecf1e717c545188243be6e676d00'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 92d31a554..760fcc500 100644 --- a/versions.json +++ b/versions.json @@ -206,51 +206,51 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e16838a28c297644908820c2fd8e7750f674603d2f1be7ffc1fc8870fdd3fec7", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-x86_64" + "sha256": "3be9ce88ecba41b734e3fc8e59a9b11531133761414a78827d1615aadb5ef1f5", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "49fb1fe211c154b49f735e5eca812f7f1394a71f0962def84fc9ff0991acfd19", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv6" + "sha256": "2ea0f36350f81ae66db2b8c12104de6ed974a328557a4967857ee6e8df4b8f26", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "6cfa4331a47c69336ef81f4295a85392fe892f54d186a71c5f79117ecea9359b", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-armv7" + "sha256": "658db542e40c8063cdafc23f650493bedc10b41b6d6fb581b7866bfeb5ffb0ba", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "74170a438753371968e6211a6f13db6e311b248ba1f952b203798a3dcfb69e33", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-aarch64" + "sha256": "6d227b060b2bc3dc5f315a07ae4f647f042755691e2da905b1a21e60a8ae3ddf", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "e037360b86a37dddc9c47abe58589b8975784ea8c5cd95d9418de9a79e10475a", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-darwin-x86_64" + "sha256": "e1f2d97ae17854771836512761ec24c1ea400b954183f6dbb21d6d6a094e1769", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "6482d7a684ea82e6590109ebf8f97573d87f312f36151830d0f8ea121c30e166", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-darwin-aarch64" + "sha256": "f490009fb9f100d9a75fd836c50277b7989e16536e596696153e118d7efa2c50", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "a936fd97515fc88ca2859b54b94d30b17abe30ffee37833ed39163512444a15e", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-ppc64le" + "sha256": "101ea490283f3c862e9bb4e7ef2a3fb38393cf2139f2b78e7a7423c91ad0c1fa", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-ppc64le" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "4831f1fda024e34947cdace9ea7e4988e9067e21b9cf6626b630bf3bee8c87ee", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-linux-s390x" + "sha256": "0826c101e1d1a070e8ab8d7649c0da3cb9e6ecf1e717c545188243be6e676d00", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "8ce1efe39658c34c924f4f6012614a26e5431d6506d6ceb3f8c9a9f3754e3656", - "url": "https://github.com/docker/compose/releases/download/v2.8.0/docker-compose-windows-x86_64.exe" + "sha256": "d362372e2e46368f16702c192b12e7e349965d3b7d01c5fbb07504a9db732e88", + "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-windows-x86_64.exe" } }, - "version": "2.8.0" + "version": "2.9.0" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From b9141858586353e77f5c163ae3772f310e3fb086 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 16 Aug 2022 11:56:01 -0700 Subject: [PATCH 084/667] Filter out buildx RCs --- versions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.sh b/versions.sh index a5ab0551c..8985eb3ac 100755 --- a/versions.sh +++ b/versions.sh @@ -67,6 +67,7 @@ buildxVersions="$( | cut -d$'\t' -f2 \ | grep '^refs/tags/v[0-9].*$' \ | sed 's!^refs/tags/v!!; s!\^{}$!!' \ + | grep -vE -- '-rc' \ | sort -ru )" buildx= From 8c45eed7c24669a4fa9da3d2e0b4098c7df3cc04 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 16 Aug 2022 17:13:39 -0700 Subject: [PATCH 085/667] Account for adjusted/fixed checksums file format in buildx --- versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.sh b/versions.sh index 8985eb3ac..ab452fa07 100755 --- a/versions.sh +++ b/versions.sh @@ -77,7 +77,7 @@ for buildxVersion in $buildxVersions; do buildx="$(jq <<<"$checksums" -csR --arg version "$buildxVersion" ' rtrimstr("\n") | split("\n") | map( - split(" ") + split(" [ *]?"; "") | { sha256: .[0], file: .[1], From ce7802202e106929f3ff23a8240d86a39b909c51 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 16 Aug 2022 17:14:11 -0700 Subject: [PATCH 086/667] Update 20.10 to buildx 0.9.0 --- 20.10/cli/Dockerfile | 30 ++++++++++++------------ versions.json | 56 ++++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index ad0f2f1f8..7ce65eff0 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.8.2 +ENV DOCKER_BUILDX_VERSION 0.9.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64'; \ - sha256='c64de4f3c30f7a73ff9db637660c7aa0f00234368105b0a09fa8e24eebe910c3'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-amd64'; \ + sha256='513e2cb7e71a21e20ae7709eb2fcc98d66117bd440d98602a84835e5cd3179bf'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v6'; \ - sha256='d0e5d19cd67ea7a351e3bfe1de96f3d583a5b80f1bbadd61f7adcd61b147e5f5'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v6'; \ + sha256='fe7390cc5a72420a5661cd580eedf08808d9271a305bdc32e00841fb2f44c5d9'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v7'; \ - sha256='b5bb1e28e9413a75b2600955c486870aafd234f69953601eecc3664bd3af7463'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v7'; \ + sha256='35d7ee9bb8ddee9715c27ad5fa1512d56dd3b3c6a13137699643d07a932eb08b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm64'; \ - sha256='304d3d9822c75f98ad9cf57f0c234bcf326bbb96d791d551728cadd72a7a377f'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm64'; \ + sha256='c288ee151a30eb6afe68937600c96eb4b6e1932c9ef46584304438b85756cea6'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-ppc64le'; \ - sha256='32b317d86c700d920468f162f93ae2282777da556ee49b4329f6c72ee2b11b85'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-ppc64le'; \ + sha256='4a324d4ae294526c9e5f3c6544a9c95009537eb38530e3fbb0940dd3f9b8d6d6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-riscv64'; \ - sha256='76d5fcf92ffa31b3e470d8ec1ab11f7b6997729e5c94d543fec765ad79ad0630'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-riscv64'; \ + sha256='794fdce2c09178dae2c7dafae75aa5c0d888e95164f419820b05e0674675b65d'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x'; \ - sha256='ec4bb6f271f38dca5a377a70be24ee2108a85f6e6ba511ad3b805c4f1602a0d2'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-s390x'; \ + sha256='81d7d84d05a6e24677d22cd812a5ba1cbfb15e44ccba652f4dfa5e3076bb58ce'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 760fcc500..9c3f61373 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.8.2.linux-amd64", - "sha256": "c64de4f3c30f7a73ff9db637660c7aa0f00234368105b0a09fa8e24eebe910c3", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64" + "file": "buildx-v0.9.0.linux-amd64", + "sha256": "513e2cb7e71a21e20ae7709eb2fcc98d66117bd440d98602a84835e5cd3179bf", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.8.2.linux-arm-v6", - "sha256": "d0e5d19cd67ea7a351e3bfe1de96f3d583a5b80f1bbadd61f7adcd61b147e5f5", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v6" + "file": "buildx-v0.9.0.linux-arm-v6", + "sha256": "fe7390cc5a72420a5661cd580eedf08808d9271a305bdc32e00841fb2f44c5d9", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.8.2.linux-arm-v7", - "sha256": "b5bb1e28e9413a75b2600955c486870aafd234f69953601eecc3664bd3af7463", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v7" + "file": "buildx-v0.9.0.linux-arm-v7", + "sha256": "35d7ee9bb8ddee9715c27ad5fa1512d56dd3b3c6a13137699643d07a932eb08b", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.8.2.linux-arm64", - "sha256": "304d3d9822c75f98ad9cf57f0c234bcf326bbb96d791d551728cadd72a7a377f", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm64" + "file": "buildx-v0.9.0.linux-arm64", + "sha256": "c288ee151a30eb6afe68937600c96eb4b6e1932c9ef46584304438b85756cea6", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.8.2.linux-ppc64le", - "sha256": "32b317d86c700d920468f162f93ae2282777da556ee49b4329f6c72ee2b11b85", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-ppc64le" + "file": "buildx-v0.9.0.linux-ppc64le", + "sha256": "4a324d4ae294526c9e5f3c6544a9c95009537eb38530e3fbb0940dd3f9b8d6d6", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.8.2.linux-riscv64", - "sha256": "76d5fcf92ffa31b3e470d8ec1ab11f7b6997729e5c94d543fec765ad79ad0630", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-riscv64" + "file": "buildx-v0.9.0.linux-riscv64", + "sha256": "794fdce2c09178dae2c7dafae75aa5c0d888e95164f419820b05e0674675b65d", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.8.2.linux-s390x", - "sha256": "ec4bb6f271f38dca5a377a70be24ee2108a85f6e6ba511ad3b805c4f1602a0d2", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x" + "file": "buildx-v0.9.0.linux-s390x", + "sha256": "81d7d84d05a6e24677d22cd812a5ba1cbfb15e44ccba652f4dfa5e3076bb58ce", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.8.2.windows-amd64.exe", - "sha256": "abd54d5a589c7745b67990b4fdbd489c922864e3725353faf6859ceed835dd4a", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-amd64.exe" + "file": "buildx-v0.9.0.windows-amd64.exe", + "sha256": "318ac6a35c919ec3f8cc5adf73d8bc294cf06ab4adcc0c4747da3050b21dc5ae", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.8.2.windows-arm64.exe", - "sha256": "8fe575d9346d30e97240ee0dd85c22b5974e8ee898a5fd26ab0d7e6792bc3cf8", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-arm64.exe" + "file": "buildx-v0.9.0.windows-arm64.exe", + "sha256": "c1e2d2554f9b24223235357c98f4ed67c8bbfae50af9d504a4775a38002dde73", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-arm64.exe" } }, - "version": "0.8.2" + "version": "0.9.0" }, "compose": { "arches": { From ddaf5f125c847522dfbe7aefe3c0849470faccb1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 16 Aug 2022 17:16:53 -0700 Subject: [PATCH 087/667] Update 22.06-rc to buildx 0.9.0 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++----------- versions.json | 56 ++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 233a21e63..8c7122bb3 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.8.2 +ENV DOCKER_BUILDX_VERSION 0.9.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64'; \ - sha256='c64de4f3c30f7a73ff9db637660c7aa0f00234368105b0a09fa8e24eebe910c3'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-amd64'; \ + sha256='513e2cb7e71a21e20ae7709eb2fcc98d66117bd440d98602a84835e5cd3179bf'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v6'; \ - sha256='d0e5d19cd67ea7a351e3bfe1de96f3d583a5b80f1bbadd61f7adcd61b147e5f5'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v6'; \ + sha256='fe7390cc5a72420a5661cd580eedf08808d9271a305bdc32e00841fb2f44c5d9'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v7'; \ - sha256='b5bb1e28e9413a75b2600955c486870aafd234f69953601eecc3664bd3af7463'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v7'; \ + sha256='35d7ee9bb8ddee9715c27ad5fa1512d56dd3b3c6a13137699643d07a932eb08b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm64'; \ - sha256='304d3d9822c75f98ad9cf57f0c234bcf326bbb96d791d551728cadd72a7a377f'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm64'; \ + sha256='c288ee151a30eb6afe68937600c96eb4b6e1932c9ef46584304438b85756cea6'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-ppc64le'; \ - sha256='32b317d86c700d920468f162f93ae2282777da556ee49b4329f6c72ee2b11b85'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-ppc64le'; \ + sha256='4a324d4ae294526c9e5f3c6544a9c95009537eb38530e3fbb0940dd3f9b8d6d6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-riscv64'; \ - sha256='76d5fcf92ffa31b3e470d8ec1ab11f7b6997729e5c94d543fec765ad79ad0630'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-riscv64'; \ + sha256='794fdce2c09178dae2c7dafae75aa5c0d888e95164f419820b05e0674675b65d'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x'; \ - sha256='ec4bb6f271f38dca5a377a70be24ee2108a85f6e6ba511ad3b805c4f1602a0d2'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-s390x'; \ + sha256='81d7d84d05a6e24677d22cd812a5ba1cbfb15e44ccba652f4dfa5e3076bb58ce'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 9c3f61373..efbd23f9f 100644 --- a/versions.json +++ b/versions.json @@ -155,52 +155,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.8.2.linux-amd64", - "sha256": "c64de4f3c30f7a73ff9db637660c7aa0f00234368105b0a09fa8e24eebe910c3", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64" + "file": "buildx-v0.9.0.linux-amd64", + "sha256": "513e2cb7e71a21e20ae7709eb2fcc98d66117bd440d98602a84835e5cd3179bf", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.8.2.linux-arm-v6", - "sha256": "d0e5d19cd67ea7a351e3bfe1de96f3d583a5b80f1bbadd61f7adcd61b147e5f5", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v6" + "file": "buildx-v0.9.0.linux-arm-v6", + "sha256": "fe7390cc5a72420a5661cd580eedf08808d9271a305bdc32e00841fb2f44c5d9", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.8.2.linux-arm-v7", - "sha256": "b5bb1e28e9413a75b2600955c486870aafd234f69953601eecc3664bd3af7463", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm-v7" + "file": "buildx-v0.9.0.linux-arm-v7", + "sha256": "35d7ee9bb8ddee9715c27ad5fa1512d56dd3b3c6a13137699643d07a932eb08b", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.8.2.linux-arm64", - "sha256": "304d3d9822c75f98ad9cf57f0c234bcf326bbb96d791d551728cadd72a7a377f", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-arm64" + "file": "buildx-v0.9.0.linux-arm64", + "sha256": "c288ee151a30eb6afe68937600c96eb4b6e1932c9ef46584304438b85756cea6", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.8.2.linux-ppc64le", - "sha256": "32b317d86c700d920468f162f93ae2282777da556ee49b4329f6c72ee2b11b85", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-ppc64le" + "file": "buildx-v0.9.0.linux-ppc64le", + "sha256": "4a324d4ae294526c9e5f3c6544a9c95009537eb38530e3fbb0940dd3f9b8d6d6", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.8.2.linux-riscv64", - "sha256": "76d5fcf92ffa31b3e470d8ec1ab11f7b6997729e5c94d543fec765ad79ad0630", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-riscv64" + "file": "buildx-v0.9.0.linux-riscv64", + "sha256": "794fdce2c09178dae2c7dafae75aa5c0d888e95164f419820b05e0674675b65d", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.8.2.linux-s390x", - "sha256": "ec4bb6f271f38dca5a377a70be24ee2108a85f6e6ba511ad3b805c4f1602a0d2", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-s390x" + "file": "buildx-v0.9.0.linux-s390x", + "sha256": "81d7d84d05a6e24677d22cd812a5ba1cbfb15e44ccba652f4dfa5e3076bb58ce", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.8.2.windows-amd64.exe", - "sha256": "abd54d5a589c7745b67990b4fdbd489c922864e3725353faf6859ceed835dd4a", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-amd64.exe" + "file": "buildx-v0.9.0.windows-amd64.exe", + "sha256": "318ac6a35c919ec3f8cc5adf73d8bc294cf06ab4adcc0c4747da3050b21dc5ae", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.8.2.windows-arm64.exe", - "sha256": "8fe575d9346d30e97240ee0dd85c22b5974e8ee898a5fd26ab0d7e6792bc3cf8", - "url": "https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.windows-arm64.exe" + "file": "buildx-v0.9.0.windows-arm64.exe", + "sha256": "c1e2d2554f9b24223235357c98f4ed67c8bbfae50af9d504a4775a38002dde73", + "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-arm64.exe" } }, - "version": "0.8.2" + "version": "0.9.0" }, "compose": { "arches": { From 863bb07a8db66fdd02e1fe61135466dd6813b0b6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Aug 2022 12:18:12 -0700 Subject: [PATCH 088/667] Update 20.10 to buildx 0.9.1 --- 20.10/cli/Dockerfile | 30 ++++++++++++------------ versions.json | 56 ++++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 7ce65eff0..a6b9d0cca 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.9.0 +ENV DOCKER_BUILDX_VERSION 0.9.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-amd64'; \ - sha256='513e2cb7e71a21e20ae7709eb2fcc98d66117bd440d98602a84835e5cd3179bf'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-amd64'; \ + sha256='a7fb95177792ca8ffc7243fad7bf2f33738b8b999a184b6201f002a63c43d136'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v6'; \ - sha256='fe7390cc5a72420a5661cd580eedf08808d9271a305bdc32e00841fb2f44c5d9'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v6'; \ + sha256='159925b4e679eb66e7f0312c7d57a97e68a418c1fa602a00dd8b29b6406768f0'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v7'; \ - sha256='35d7ee9bb8ddee9715c27ad5fa1512d56dd3b3c6a13137699643d07a932eb08b'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v7'; \ + sha256='ba8e5359ce9ba24fec6da07f73591c1b20ac0797a2248b0ef8088f57ae3340fc'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm64'; \ - sha256='c288ee151a30eb6afe68937600c96eb4b6e1932c9ef46584304438b85756cea6'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm64'; \ + sha256='bbf6a76bf9aef9c5759ff225b97ce23a24fc11e4fa3cdcae36e5dcf1de2cffc5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-ppc64le'; \ - sha256='4a324d4ae294526c9e5f3c6544a9c95009537eb38530e3fbb0940dd3f9b8d6d6'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-ppc64le'; \ + sha256='1b2441886e556c720c1bf12f18f240113cc45f9eb404c0f162166ca1c96c1b60'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-riscv64'; \ - sha256='794fdce2c09178dae2c7dafae75aa5c0d888e95164f419820b05e0674675b65d'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-riscv64'; \ + sha256='c32372dad653fc70eb756b2cffd026e74425e807c01accaeed4559da881ff57c'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-s390x'; \ - sha256='81d7d84d05a6e24677d22cd812a5ba1cbfb15e44ccba652f4dfa5e3076bb58ce'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-s390x'; \ + sha256='90b0ecf315d741888920dddeac9fe2e141123c4fe79465b7b10fe23521c9c366'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index efbd23f9f..11fa084e2 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.9.0.linux-amd64", - "sha256": "513e2cb7e71a21e20ae7709eb2fcc98d66117bd440d98602a84835e5cd3179bf", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-amd64" + "file": "buildx-v0.9.1.linux-amd64", + "sha256": "a7fb95177792ca8ffc7243fad7bf2f33738b8b999a184b6201f002a63c43d136", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.9.0.linux-arm-v6", - "sha256": "fe7390cc5a72420a5661cd580eedf08808d9271a305bdc32e00841fb2f44c5d9", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v6" + "file": "buildx-v0.9.1.linux-arm-v6", + "sha256": "159925b4e679eb66e7f0312c7d57a97e68a418c1fa602a00dd8b29b6406768f0", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.9.0.linux-arm-v7", - "sha256": "35d7ee9bb8ddee9715c27ad5fa1512d56dd3b3c6a13137699643d07a932eb08b", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v7" + "file": "buildx-v0.9.1.linux-arm-v7", + "sha256": "ba8e5359ce9ba24fec6da07f73591c1b20ac0797a2248b0ef8088f57ae3340fc", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.9.0.linux-arm64", - "sha256": "c288ee151a30eb6afe68937600c96eb4b6e1932c9ef46584304438b85756cea6", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm64" + "file": "buildx-v0.9.1.linux-arm64", + "sha256": "bbf6a76bf9aef9c5759ff225b97ce23a24fc11e4fa3cdcae36e5dcf1de2cffc5", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.9.0.linux-ppc64le", - "sha256": "4a324d4ae294526c9e5f3c6544a9c95009537eb38530e3fbb0940dd3f9b8d6d6", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-ppc64le" + "file": "buildx-v0.9.1.linux-ppc64le", + "sha256": "1b2441886e556c720c1bf12f18f240113cc45f9eb404c0f162166ca1c96c1b60", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.9.0.linux-riscv64", - "sha256": "794fdce2c09178dae2c7dafae75aa5c0d888e95164f419820b05e0674675b65d", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-riscv64" + "file": "buildx-v0.9.1.linux-riscv64", + "sha256": "c32372dad653fc70eb756b2cffd026e74425e807c01accaeed4559da881ff57c", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.9.0.linux-s390x", - "sha256": "81d7d84d05a6e24677d22cd812a5ba1cbfb15e44ccba652f4dfa5e3076bb58ce", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-s390x" + "file": "buildx-v0.9.1.linux-s390x", + "sha256": "90b0ecf315d741888920dddeac9fe2e141123c4fe79465b7b10fe23521c9c366", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.9.0.windows-amd64.exe", - "sha256": "318ac6a35c919ec3f8cc5adf73d8bc294cf06ab4adcc0c4747da3050b21dc5ae", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-amd64.exe" + "file": "buildx-v0.9.1.windows-amd64.exe", + "sha256": "a5c53f2e710989c2f6301f6bf8b505e7f581d3d4b9adcb5a1d3f9a36a51d3e46", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.9.0.windows-arm64.exe", - "sha256": "c1e2d2554f9b24223235357c98f4ed67c8bbfae50af9d504a4775a38002dde73", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-arm64.exe" + "file": "buildx-v0.9.1.windows-arm64.exe", + "sha256": "96cb96519f6b008cc68a50884d43869bfc76611f5f13f32bf843a26fb898941c", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-arm64.exe" } }, - "version": "0.9.0" + "version": "0.9.1" }, "compose": { "arches": { From 2518da5eda5a13e5ada0a4560223eae96c10aaed Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Aug 2022 12:20:38 -0700 Subject: [PATCH 089/667] Update 22.06-rc to buildx 0.9.1 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++----------- versions.json | 56 ++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 8c7122bb3..252f11622 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.9.0 +ENV DOCKER_BUILDX_VERSION 0.9.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-amd64'; \ - sha256='513e2cb7e71a21e20ae7709eb2fcc98d66117bd440d98602a84835e5cd3179bf'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-amd64'; \ + sha256='a7fb95177792ca8ffc7243fad7bf2f33738b8b999a184b6201f002a63c43d136'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v6'; \ - sha256='fe7390cc5a72420a5661cd580eedf08808d9271a305bdc32e00841fb2f44c5d9'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v6'; \ + sha256='159925b4e679eb66e7f0312c7d57a97e68a418c1fa602a00dd8b29b6406768f0'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v7'; \ - sha256='35d7ee9bb8ddee9715c27ad5fa1512d56dd3b3c6a13137699643d07a932eb08b'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v7'; \ + sha256='ba8e5359ce9ba24fec6da07f73591c1b20ac0797a2248b0ef8088f57ae3340fc'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm64'; \ - sha256='c288ee151a30eb6afe68937600c96eb4b6e1932c9ef46584304438b85756cea6'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm64'; \ + sha256='bbf6a76bf9aef9c5759ff225b97ce23a24fc11e4fa3cdcae36e5dcf1de2cffc5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-ppc64le'; \ - sha256='4a324d4ae294526c9e5f3c6544a9c95009537eb38530e3fbb0940dd3f9b8d6d6'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-ppc64le'; \ + sha256='1b2441886e556c720c1bf12f18f240113cc45f9eb404c0f162166ca1c96c1b60'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-riscv64'; \ - sha256='794fdce2c09178dae2c7dafae75aa5c0d888e95164f419820b05e0674675b65d'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-riscv64'; \ + sha256='c32372dad653fc70eb756b2cffd026e74425e807c01accaeed4559da881ff57c'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-s390x'; \ - sha256='81d7d84d05a6e24677d22cd812a5ba1cbfb15e44ccba652f4dfa5e3076bb58ce'; \ + url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-s390x'; \ + sha256='90b0ecf315d741888920dddeac9fe2e141123c4fe79465b7b10fe23521c9c366'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 11fa084e2..84f89f208 100644 --- a/versions.json +++ b/versions.json @@ -155,52 +155,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.9.0.linux-amd64", - "sha256": "513e2cb7e71a21e20ae7709eb2fcc98d66117bd440d98602a84835e5cd3179bf", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-amd64" + "file": "buildx-v0.9.1.linux-amd64", + "sha256": "a7fb95177792ca8ffc7243fad7bf2f33738b8b999a184b6201f002a63c43d136", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.9.0.linux-arm-v6", - "sha256": "fe7390cc5a72420a5661cd580eedf08808d9271a305bdc32e00841fb2f44c5d9", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v6" + "file": "buildx-v0.9.1.linux-arm-v6", + "sha256": "159925b4e679eb66e7f0312c7d57a97e68a418c1fa602a00dd8b29b6406768f0", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.9.0.linux-arm-v7", - "sha256": "35d7ee9bb8ddee9715c27ad5fa1512d56dd3b3c6a13137699643d07a932eb08b", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm-v7" + "file": "buildx-v0.9.1.linux-arm-v7", + "sha256": "ba8e5359ce9ba24fec6da07f73591c1b20ac0797a2248b0ef8088f57ae3340fc", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.9.0.linux-arm64", - "sha256": "c288ee151a30eb6afe68937600c96eb4b6e1932c9ef46584304438b85756cea6", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-arm64" + "file": "buildx-v0.9.1.linux-arm64", + "sha256": "bbf6a76bf9aef9c5759ff225b97ce23a24fc11e4fa3cdcae36e5dcf1de2cffc5", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.9.0.linux-ppc64le", - "sha256": "4a324d4ae294526c9e5f3c6544a9c95009537eb38530e3fbb0940dd3f9b8d6d6", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-ppc64le" + "file": "buildx-v0.9.1.linux-ppc64le", + "sha256": "1b2441886e556c720c1bf12f18f240113cc45f9eb404c0f162166ca1c96c1b60", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.9.0.linux-riscv64", - "sha256": "794fdce2c09178dae2c7dafae75aa5c0d888e95164f419820b05e0674675b65d", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-riscv64" + "file": "buildx-v0.9.1.linux-riscv64", + "sha256": "c32372dad653fc70eb756b2cffd026e74425e807c01accaeed4559da881ff57c", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.9.0.linux-s390x", - "sha256": "81d7d84d05a6e24677d22cd812a5ba1cbfb15e44ccba652f4dfa5e3076bb58ce", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.linux-s390x" + "file": "buildx-v0.9.1.linux-s390x", + "sha256": "90b0ecf315d741888920dddeac9fe2e141123c4fe79465b7b10fe23521c9c366", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.9.0.windows-amd64.exe", - "sha256": "318ac6a35c919ec3f8cc5adf73d8bc294cf06ab4adcc0c4747da3050b21dc5ae", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-amd64.exe" + "file": "buildx-v0.9.1.windows-amd64.exe", + "sha256": "a5c53f2e710989c2f6301f6bf8b505e7f581d3d4b9adcb5a1d3f9a36a51d3e46", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.9.0.windows-arm64.exe", - "sha256": "c1e2d2554f9b24223235357c98f4ed67c8bbfae50af9d504a4775a38002dde73", - "url": "https://github.com/docker/buildx/releases/download/v0.9.0/buildx-v0.9.0.windows-arm64.exe" + "file": "buildx-v0.9.1.windows-arm64.exe", + "sha256": "96cb96519f6b008cc68a50884d43869bfc76611f5f13f32bf843a26fb898941c", + "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-arm64.exe" } }, - "version": "0.9.0" + "version": "0.9.1" }, "compose": { "arches": { From bd567a048e121bbf8b24d08ffc52cd809ec33321 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 24 Aug 2022 12:06:59 -0700 Subject: [PATCH 090/667] Fix compose/buildx version sorting --- versions.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/versions.sh b/versions.sh index ab452fa07..16626d3e5 100755 --- a/versions.sh +++ b/versions.sh @@ -68,7 +68,7 @@ buildxVersions="$( | grep '^refs/tags/v[0-9].*$' \ | sed 's!^refs/tags/v!!; s!\^{}$!!' \ | grep -vE -- '-rc' \ - | sort -ru + | sort -ruV )" buildx= buildxVersion= @@ -96,7 +96,7 @@ for buildxVersion in $buildxVersions; do "ppc64le": "ppc64le", "riscv64": "riscv64", "s390x": "s390x", - }[.arch] // error("unknown architecture: " + .arch)) + }[.arch] // error("unknown buildx architecture: " + .arch)) ): . } ) | add @@ -118,7 +118,7 @@ composeVersions="$( | cut -d$'\t' -f2 \ | grep '^refs/tags/v[0-9].*$' \ | sed 's!^refs/tags/v!!; s!\^{}$!!' \ - | sort -ru + | sort -ruV )" compose= composeVersion= @@ -144,9 +144,10 @@ for composeVersion in $composeVersions; do armv6: "arm32v6", armv7: "arm32v7", ppc64le: "ppc64le", + riscv64: "riscv64", s390x: "s390x", x86_64: "amd64", - }[.[1]] // error("unknown architecture: " + .[1])) + }[.[1]] // error("unknown compose architecture: " + .[1])) ): . } ) | add From 0fa745461cd9944d46fa8a5c98e69abf11e3fce6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Aug 2022 12:07:27 -0700 Subject: [PATCH 091/667] Update 20.10 to compose 2.10.1 --- 20.10/cli/Dockerfile | 30 +++++++++++++++------------ versions.json | 48 ++++++++++++++++++++++++++------------------ 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index a6b9d0cca..d7cf2f42c 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,34 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.9.0 +ENV DOCKER_COMPOSE_VERSION 2.10.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-x86_64'; \ - sha256='3be9ce88ecba41b734e3fc8e59a9b11531133761414a78827d1615aadb5ef1f5'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-x86_64'; \ + sha256='dfe2e3f134cc053e020891a11c23a0923eb49ee35556ec40b37d098eaa5a55f6'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv6'; \ - sha256='2ea0f36350f81ae66db2b8c12104de6ed974a328557a4967857ee6e8df4b8f26'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv6'; \ + sha256='8f9e1ccf35763b292443112795418b3ec9e8df46f8d78ca2c92d44645a90b88f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv7'; \ - sha256='658db542e40c8063cdafc23f650493bedc10b41b6d6fb581b7866bfeb5ffb0ba'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv7'; \ + sha256='4a1bd3d72ff2d21248f5e1a32cdabc81aca9d613ce0eee661ac3cb6815db1258'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-aarch64'; \ - sha256='6d227b060b2bc3dc5f315a07ae4f647f042755691e2da905b1a21e60a8ae3ddf'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-aarch64'; \ + sha256='2598b299693d3ef6087a8faa02e91e29bc2f4515347a0cf4c9ea18967584f153'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-ppc64le'; \ - sha256='101ea490283f3c862e9bb4e7ef2a3fb38393cf2139f2b78e7a7423c91ad0c1fa'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-ppc64le'; \ + sha256='4866a6df1bc35eda103b0d32b357e2da4aae0b4eff96dd19ea4c1d6ddbc43e9f'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-riscv64'; \ + sha256='8211dc32f228ac6d8685c2d07f579654771af3e792ebc6cc8a212536229630c3'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-s390x'; \ - sha256='0826c101e1d1a070e8ab8d7649c0da3cb9e6ecf1e717c545188243be6e676d00'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-s390x'; \ + sha256='56b70071f7ab4acf7387cb3ce8492ec084650b435a2f483d355931bfa5536496'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 84f89f208..8caf20668 100644 --- a/versions.json +++ b/versions.json @@ -73,51 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "3be9ce88ecba41b734e3fc8e59a9b11531133761414a78827d1615aadb5ef1f5", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-x86_64" + "sha256": "dfe2e3f134cc053e020891a11c23a0923eb49ee35556ec40b37d098eaa5a55f6", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "2ea0f36350f81ae66db2b8c12104de6ed974a328557a4967857ee6e8df4b8f26", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv6" + "sha256": "8f9e1ccf35763b292443112795418b3ec9e8df46f8d78ca2c92d44645a90b88f", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "658db542e40c8063cdafc23f650493bedc10b41b6d6fb581b7866bfeb5ffb0ba", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv7" + "sha256": "4a1bd3d72ff2d21248f5e1a32cdabc81aca9d613ce0eee661ac3cb6815db1258", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "6d227b060b2bc3dc5f315a07ae4f647f042755691e2da905b1a21e60a8ae3ddf", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-aarch64" + "sha256": "2598b299693d3ef6087a8faa02e91e29bc2f4515347a0cf4c9ea18967584f153", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "e1f2d97ae17854771836512761ec24c1ea400b954183f6dbb21d6d6a094e1769", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-darwin-x86_64" + "sha256": "743db98f42fd2dd906b81b895066f72535ea315ce77f9430affab3419d4d8c65", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "f490009fb9f100d9a75fd836c50277b7989e16536e596696153e118d7efa2c50", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-darwin-aarch64" + "sha256": "ab3fe96c0c1cfe6ba170e90f21293d5c3debfc8c5075f51f85c00fba823e2e46", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "101ea490283f3c862e9bb4e7ef2a3fb38393cf2139f2b78e7a7423c91ad0c1fa", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-ppc64le" + "sha256": "4866a6df1bc35eda103b0d32b357e2da4aae0b4eff96dd19ea4c1d6ddbc43e9f", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "8211dc32f228ac6d8685c2d07f579654771af3e792ebc6cc8a212536229630c3", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "0826c101e1d1a070e8ab8d7649c0da3cb9e6ecf1e717c545188243be6e676d00", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-s390x" + "sha256": "56b70071f7ab4acf7387cb3ce8492ec084650b435a2f483d355931bfa5536496", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "d362372e2e46368f16702c192b12e7e349965d3b7d01c5fbb07504a9db732e88", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-windows-x86_64.exe" + "sha256": "9417f257b672242092f968bc4433c4d6d7c7b0977d45badde9faa8a6f04c2003", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "863c77637306549502ee4dc0e49a0f82dc0fe1c58c719b04c0eec1e1d599bffa", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.9.0" + "version": "2.10.1" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 5bd36bedb320dab62684649d5efb7c4da14866a9 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Aug 2022 12:10:02 -0700 Subject: [PATCH 092/667] Update 22.06-rc to compose 2.10.1 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++++++----------- versions.json | 48 +++++++++++++++++++++++++---------------- 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 252f11622..9ce0f2a03 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,34 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.9.0 +ENV DOCKER_COMPOSE_VERSION 2.10.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-x86_64'; \ - sha256='3be9ce88ecba41b734e3fc8e59a9b11531133761414a78827d1615aadb5ef1f5'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-x86_64'; \ + sha256='dfe2e3f134cc053e020891a11c23a0923eb49ee35556ec40b37d098eaa5a55f6'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv6'; \ - sha256='2ea0f36350f81ae66db2b8c12104de6ed974a328557a4967857ee6e8df4b8f26'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv6'; \ + sha256='8f9e1ccf35763b292443112795418b3ec9e8df46f8d78ca2c92d44645a90b88f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv7'; \ - sha256='658db542e40c8063cdafc23f650493bedc10b41b6d6fb581b7866bfeb5ffb0ba'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv7'; \ + sha256='4a1bd3d72ff2d21248f5e1a32cdabc81aca9d613ce0eee661ac3cb6815db1258'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-aarch64'; \ - sha256='6d227b060b2bc3dc5f315a07ae4f647f042755691e2da905b1a21e60a8ae3ddf'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-aarch64'; \ + sha256='2598b299693d3ef6087a8faa02e91e29bc2f4515347a0cf4c9ea18967584f153'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-ppc64le'; \ - sha256='101ea490283f3c862e9bb4e7ef2a3fb38393cf2139f2b78e7a7423c91ad0c1fa'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-ppc64le'; \ + sha256='4866a6df1bc35eda103b0d32b357e2da4aae0b4eff96dd19ea4c1d6ddbc43e9f'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-riscv64'; \ + sha256='8211dc32f228ac6d8685c2d07f579654771af3e792ebc6cc8a212536229630c3'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-s390x'; \ - sha256='0826c101e1d1a070e8ab8d7649c0da3cb9e6ecf1e717c545188243be6e676d00'; \ + url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-s390x'; \ + sha256='56b70071f7ab4acf7387cb3ce8492ec084650b435a2f483d355931bfa5536496'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 8caf20668..9d3a61c15 100644 --- a/versions.json +++ b/versions.json @@ -216,51 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "3be9ce88ecba41b734e3fc8e59a9b11531133761414a78827d1615aadb5ef1f5", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-x86_64" + "sha256": "dfe2e3f134cc053e020891a11c23a0923eb49ee35556ec40b37d098eaa5a55f6", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "2ea0f36350f81ae66db2b8c12104de6ed974a328557a4967857ee6e8df4b8f26", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv6" + "sha256": "8f9e1ccf35763b292443112795418b3ec9e8df46f8d78ca2c92d44645a90b88f", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "658db542e40c8063cdafc23f650493bedc10b41b6d6fb581b7866bfeb5ffb0ba", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-armv7" + "sha256": "4a1bd3d72ff2d21248f5e1a32cdabc81aca9d613ce0eee661ac3cb6815db1258", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "6d227b060b2bc3dc5f315a07ae4f647f042755691e2da905b1a21e60a8ae3ddf", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-aarch64" + "sha256": "2598b299693d3ef6087a8faa02e91e29bc2f4515347a0cf4c9ea18967584f153", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "e1f2d97ae17854771836512761ec24c1ea400b954183f6dbb21d6d6a094e1769", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-darwin-x86_64" + "sha256": "743db98f42fd2dd906b81b895066f72535ea315ce77f9430affab3419d4d8c65", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "f490009fb9f100d9a75fd836c50277b7989e16536e596696153e118d7efa2c50", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-darwin-aarch64" + "sha256": "ab3fe96c0c1cfe6ba170e90f21293d5c3debfc8c5075f51f85c00fba823e2e46", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "101ea490283f3c862e9bb4e7ef2a3fb38393cf2139f2b78e7a7423c91ad0c1fa", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-ppc64le" + "sha256": "4866a6df1bc35eda103b0d32b357e2da4aae0b4eff96dd19ea4c1d6ddbc43e9f", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "8211dc32f228ac6d8685c2d07f579654771af3e792ebc6cc8a212536229630c3", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "0826c101e1d1a070e8ab8d7649c0da3cb9e6ecf1e717c545188243be6e676d00", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-linux-s390x" + "sha256": "56b70071f7ab4acf7387cb3ce8492ec084650b435a2f483d355931bfa5536496", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "d362372e2e46368f16702c192b12e7e349965d3b7d01c5fbb07504a9db732e88", - "url": "https://github.com/docker/compose/releases/download/v2.9.0/docker-compose-windows-x86_64.exe" + "sha256": "9417f257b672242092f968bc4433c4d6d7c7b0977d45badde9faa8a6f04c2003", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "863c77637306549502ee4dc0e49a0f82dc0fe1c58c719b04c0eec1e1d599bffa", + "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.9.0" + "version": "2.10.1" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 46a5fa097f8b9995cdab2270f0ffa623c243c3d2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 26 Aug 2022 13:42:34 -0700 Subject: [PATCH 093/667] Update 20.10 to compose 2.10.2 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index d7cf2f42c..bca0a00e8 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.10.1 +ENV DOCKER_COMPOSE_VERSION 2.10.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-x86_64'; \ - sha256='dfe2e3f134cc053e020891a11c23a0923eb49ee35556ec40b37d098eaa5a55f6'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-x86_64'; \ + sha256='41e9657c8abd7d656c3a40df1ae9c1171930313707a3abd5420ec8852b59eeb7'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv6'; \ - sha256='8f9e1ccf35763b292443112795418b3ec9e8df46f8d78ca2c92d44645a90b88f'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv6'; \ + sha256='56fe4280d29c8714ef63e3e8de039522b519a1cdcfb577c1c02c7c00f581e326'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv7'; \ - sha256='4a1bd3d72ff2d21248f5e1a32cdabc81aca9d613ce0eee661ac3cb6815db1258'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv7'; \ + sha256='709aa427507a3a064d822977d2b1d68a0bd78a114c714970033b5e6731f9879b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-aarch64'; \ - sha256='2598b299693d3ef6087a8faa02e91e29bc2f4515347a0cf4c9ea18967584f153'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-aarch64'; \ + sha256='dcac4e71c52264a795d0271b36cd6b2ea0ac266931618fab2e9e9a803ed16a4a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-ppc64le'; \ - sha256='4866a6df1bc35eda103b0d32b357e2da4aae0b4eff96dd19ea4c1d6ddbc43e9f'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-ppc64le'; \ + sha256='5c1b7a13f39aa24d3369954f692aee776d9621a3cad4ddd513aa26918debd202'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-riscv64'; \ - sha256='8211dc32f228ac6d8685c2d07f579654771af3e792ebc6cc8a212536229630c3'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-riscv64'; \ + sha256='4bf02048f307cf1e8b432c18aee33022be50562d52afbab09d28e90cbff9e900'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-s390x'; \ - sha256='56b70071f7ab4acf7387cb3ce8492ec084650b435a2f483d355931bfa5536496'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-s390x'; \ + sha256='a29c82751b14f2693933ddbfc00c464fc3d78143f534024244e915880ed15760'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 9d3a61c15..edb662a7b 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "dfe2e3f134cc053e020891a11c23a0923eb49ee35556ec40b37d098eaa5a55f6", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-x86_64" + "sha256": "41e9657c8abd7d656c3a40df1ae9c1171930313707a3abd5420ec8852b59eeb7", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "8f9e1ccf35763b292443112795418b3ec9e8df46f8d78ca2c92d44645a90b88f", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv6" + "sha256": "56fe4280d29c8714ef63e3e8de039522b519a1cdcfb577c1c02c7c00f581e326", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4a1bd3d72ff2d21248f5e1a32cdabc81aca9d613ce0eee661ac3cb6815db1258", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv7" + "sha256": "709aa427507a3a064d822977d2b1d68a0bd78a114c714970033b5e6731f9879b", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "2598b299693d3ef6087a8faa02e91e29bc2f4515347a0cf4c9ea18967584f153", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-aarch64" + "sha256": "dcac4e71c52264a795d0271b36cd6b2ea0ac266931618fab2e9e9a803ed16a4a", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "743db98f42fd2dd906b81b895066f72535ea315ce77f9430affab3419d4d8c65", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-darwin-x86_64" + "sha256": "73ce29978c66d4c903393700f6cbeb60871c91d75cf7e528cb5a00ea10353534", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "ab3fe96c0c1cfe6ba170e90f21293d5c3debfc8c5075f51f85c00fba823e2e46", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-darwin-aarch64" + "sha256": "f81629d52a43bf68e77f10abac96a0040643a05a382f6a11c1c6b77b614ae6a8", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4866a6df1bc35eda103b0d32b357e2da4aae0b4eff96dd19ea4c1d6ddbc43e9f", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-ppc64le" + "sha256": "5c1b7a13f39aa24d3369954f692aee776d9621a3cad4ddd513aa26918debd202", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "8211dc32f228ac6d8685c2d07f579654771af3e792ebc6cc8a212536229630c3", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-riscv64" + "sha256": "4bf02048f307cf1e8b432c18aee33022be50562d52afbab09d28e90cbff9e900", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "56b70071f7ab4acf7387cb3ce8492ec084650b435a2f483d355931bfa5536496", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-s390x" + "sha256": "a29c82751b14f2693933ddbfc00c464fc3d78143f534024244e915880ed15760", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "9417f257b672242092f968bc4433c4d6d7c7b0977d45badde9faa8a6f04c2003", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-windows-x86_64.exe" + "sha256": "8748acb910d9e8e622ec6f89f9d82c3696ab3485ed7094d0e976506fba33b155", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "863c77637306549502ee4dc0e49a0f82dc0fe1c58c719b04c0eec1e1d599bffa", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-windows-aarch64.exe" + "sha256": "9d29c95609ed17aadefa4b4b9e1fec83931bc10239ea7b4ca0c0b6303eec4456", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.10.1" + "version": "2.10.2" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 3bc216c99bcf44b2cf8f8873a705e95e484b0901 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 26 Aug 2022 13:44:51 -0700 Subject: [PATCH 094/667] Update 22.06-rc to compose 2.10.2 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 ++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 9ce0f2a03..c5ebd536e 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.10.1 +ENV DOCKER_COMPOSE_VERSION 2.10.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-x86_64'; \ - sha256='dfe2e3f134cc053e020891a11c23a0923eb49ee35556ec40b37d098eaa5a55f6'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-x86_64'; \ + sha256='41e9657c8abd7d656c3a40df1ae9c1171930313707a3abd5420ec8852b59eeb7'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv6'; \ - sha256='8f9e1ccf35763b292443112795418b3ec9e8df46f8d78ca2c92d44645a90b88f'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv6'; \ + sha256='56fe4280d29c8714ef63e3e8de039522b519a1cdcfb577c1c02c7c00f581e326'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv7'; \ - sha256='4a1bd3d72ff2d21248f5e1a32cdabc81aca9d613ce0eee661ac3cb6815db1258'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv7'; \ + sha256='709aa427507a3a064d822977d2b1d68a0bd78a114c714970033b5e6731f9879b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-aarch64'; \ - sha256='2598b299693d3ef6087a8faa02e91e29bc2f4515347a0cf4c9ea18967584f153'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-aarch64'; \ + sha256='dcac4e71c52264a795d0271b36cd6b2ea0ac266931618fab2e9e9a803ed16a4a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-ppc64le'; \ - sha256='4866a6df1bc35eda103b0d32b357e2da4aae0b4eff96dd19ea4c1d6ddbc43e9f'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-ppc64le'; \ + sha256='5c1b7a13f39aa24d3369954f692aee776d9621a3cad4ddd513aa26918debd202'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-riscv64'; \ - sha256='8211dc32f228ac6d8685c2d07f579654771af3e792ebc6cc8a212536229630c3'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-riscv64'; \ + sha256='4bf02048f307cf1e8b432c18aee33022be50562d52afbab09d28e90cbff9e900'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-s390x'; \ - sha256='56b70071f7ab4acf7387cb3ce8492ec084650b435a2f483d355931bfa5536496'; \ + url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-s390x'; \ + sha256='a29c82751b14f2693933ddbfc00c464fc3d78143f534024244e915880ed15760'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index edb662a7b..05f38f941 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "dfe2e3f134cc053e020891a11c23a0923eb49ee35556ec40b37d098eaa5a55f6", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-x86_64" + "sha256": "41e9657c8abd7d656c3a40df1ae9c1171930313707a3abd5420ec8852b59eeb7", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "8f9e1ccf35763b292443112795418b3ec9e8df46f8d78ca2c92d44645a90b88f", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv6" + "sha256": "56fe4280d29c8714ef63e3e8de039522b519a1cdcfb577c1c02c7c00f581e326", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4a1bd3d72ff2d21248f5e1a32cdabc81aca9d613ce0eee661ac3cb6815db1258", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-armv7" + "sha256": "709aa427507a3a064d822977d2b1d68a0bd78a114c714970033b5e6731f9879b", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "2598b299693d3ef6087a8faa02e91e29bc2f4515347a0cf4c9ea18967584f153", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-aarch64" + "sha256": "dcac4e71c52264a795d0271b36cd6b2ea0ac266931618fab2e9e9a803ed16a4a", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "743db98f42fd2dd906b81b895066f72535ea315ce77f9430affab3419d4d8c65", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-darwin-x86_64" + "sha256": "73ce29978c66d4c903393700f6cbeb60871c91d75cf7e528cb5a00ea10353534", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "ab3fe96c0c1cfe6ba170e90f21293d5c3debfc8c5075f51f85c00fba823e2e46", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-darwin-aarch64" + "sha256": "f81629d52a43bf68e77f10abac96a0040643a05a382f6a11c1c6b77b614ae6a8", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4866a6df1bc35eda103b0d32b357e2da4aae0b4eff96dd19ea4c1d6ddbc43e9f", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-ppc64le" + "sha256": "5c1b7a13f39aa24d3369954f692aee776d9621a3cad4ddd513aa26918debd202", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "8211dc32f228ac6d8685c2d07f579654771af3e792ebc6cc8a212536229630c3", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-riscv64" + "sha256": "4bf02048f307cf1e8b432c18aee33022be50562d52afbab09d28e90cbff9e900", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "56b70071f7ab4acf7387cb3ce8492ec084650b435a2f483d355931bfa5536496", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-linux-s390x" + "sha256": "a29c82751b14f2693933ddbfc00c464fc3d78143f534024244e915880ed15760", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "9417f257b672242092f968bc4433c4d6d7c7b0977d45badde9faa8a6f04c2003", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-windows-x86_64.exe" + "sha256": "8748acb910d9e8e622ec6f89f9d82c3696ab3485ed7094d0e976506fba33b155", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "863c77637306549502ee4dc0e49a0f82dc0fe1c58c719b04c0eec1e1d599bffa", - "url": "https://github.com/docker/compose/releases/download/v2.10.1/docker-compose-windows-aarch64.exe" + "sha256": "9d29c95609ed17aadefa4b4b9e1fec83931bc10239ea7b4ca0c0b6303eec4456", + "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.10.1" + "version": "2.10.2" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From c13cbee1cfd9d7582f7b2e9f958cf24e39b64715 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 9 Sep 2022 04:04:16 -0700 Subject: [PATCH 095/667] Update 20.10 to 20.10.18 --- 20.10/cli/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/dind/Dockerfile | 8 ++++---- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index bca0a00e8..8126a3a8b 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -19,23 +19,23 @@ 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 20.10.17 +ENV DOCKER_VERSION 20.10.18 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.18.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.17.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.18.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.17.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.18.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.17.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.18.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 725ef2f75..4dc7fcb7b 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.17.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.18.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.17.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.18.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index ac2295a9e..d46b380c1 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/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-20.10.17.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.18.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.17.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.18.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.17.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.18.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.17.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.18.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 828572326..614030c80 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.17 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.17.zip +ENV DOCKER_VERSION 20.10.18 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.18.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index 04c186d6a..bd5ddd6e2 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.17 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.17.zip +ENV DOCKER_VERSION 20.10.18 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.18.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/versions.json b/versions.json index 05f38f941..8ade63165 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "20.10": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.17.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.17.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.18.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.18.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.17.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.18.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.17.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.18.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.17.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.17.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.18.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.18.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.17.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.18.zip" } }, "buildx": { @@ -138,7 +138,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.17" + "version": "20.10.18" }, "20.10-rc": null, "22.06": null, From eb357e73137c2e5bc0d098d760d6d0fda6d4e655 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 14 Sep 2022 10:04:20 -0700 Subject: [PATCH 096/667] Update 20.10 to compose 2.11.0 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 8126a3a8b..10ac62675 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.10.2 +ENV DOCKER_COMPOSE_VERSION 2.11.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-x86_64'; \ - sha256='41e9657c8abd7d656c3a40df1ae9c1171930313707a3abd5420ec8852b59eeb7'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-x86_64'; \ + sha256='e15e0d04bb2ae3885a375a575f27ebd79679f01df2dcb1257bd2c5afe1966122'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv6'; \ - sha256='56fe4280d29c8714ef63e3e8de039522b519a1cdcfb577c1c02c7c00f581e326'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv6'; \ + sha256='25b8aca3e61654be4324080ccb758f47a165c6028b57d2c4b4a0bae967274a4e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv7'; \ - sha256='709aa427507a3a064d822977d2b1d68a0bd78a114c714970033b5e6731f9879b'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv7'; \ + sha256='d13b829fc9637bbf291cd4c90ddc19da7d9c69e4788399641e01657f93208c9e'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-aarch64'; \ - sha256='dcac4e71c52264a795d0271b36cd6b2ea0ac266931618fab2e9e9a803ed16a4a'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-aarch64'; \ + sha256='26088a6f1afbb58c78b2d7a7eaa0ec36df59f9f45729843ca1031ec75472b6bc'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-ppc64le'; \ - sha256='5c1b7a13f39aa24d3369954f692aee776d9621a3cad4ddd513aa26918debd202'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-ppc64le'; \ + sha256='44334a3632c9a34a519860c1edc2f251addbcace694ec38f04a5d825358d9fd9'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-riscv64'; \ - sha256='4bf02048f307cf1e8b432c18aee33022be50562d52afbab09d28e90cbff9e900'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-riscv64'; \ + sha256='dd6cf7a96fec0abd69be360f525e21ae85b97b18e45dd393feee1678457fc1b9'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-s390x'; \ - sha256='a29c82751b14f2693933ddbfc00c464fc3d78143f534024244e915880ed15760'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-s390x'; \ + sha256='fc350527128f6ed0fb71baed1df0f905217c1ac90565be5b57c2a3d784de0e14'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 8ade63165..ee84fc9d4 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "41e9657c8abd7d656c3a40df1ae9c1171930313707a3abd5420ec8852b59eeb7", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-x86_64" + "sha256": "e15e0d04bb2ae3885a375a575f27ebd79679f01df2dcb1257bd2c5afe1966122", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "56fe4280d29c8714ef63e3e8de039522b519a1cdcfb577c1c02c7c00f581e326", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv6" + "sha256": "25b8aca3e61654be4324080ccb758f47a165c6028b57d2c4b4a0bae967274a4e", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "709aa427507a3a064d822977d2b1d68a0bd78a114c714970033b5e6731f9879b", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv7" + "sha256": "d13b829fc9637bbf291cd4c90ddc19da7d9c69e4788399641e01657f93208c9e", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "dcac4e71c52264a795d0271b36cd6b2ea0ac266931618fab2e9e9a803ed16a4a", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-aarch64" + "sha256": "26088a6f1afbb58c78b2d7a7eaa0ec36df59f9f45729843ca1031ec75472b6bc", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "73ce29978c66d4c903393700f6cbeb60871c91d75cf7e528cb5a00ea10353534", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-darwin-x86_64" + "sha256": "8d5d3ce22e4b8904186bf117b17e77f39838703360175ccffd504eb6fb010b2d", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "f81629d52a43bf68e77f10abac96a0040643a05a382f6a11c1c6b77b614ae6a8", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-darwin-aarch64" + "sha256": "5af0a7ff9eea13bfe419ab15c6399292b9bde1b76298a6716d581addb167c7ed", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "5c1b7a13f39aa24d3369954f692aee776d9621a3cad4ddd513aa26918debd202", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-ppc64le" + "sha256": "44334a3632c9a34a519860c1edc2f251addbcace694ec38f04a5d825358d9fd9", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "4bf02048f307cf1e8b432c18aee33022be50562d52afbab09d28e90cbff9e900", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-riscv64" + "sha256": "dd6cf7a96fec0abd69be360f525e21ae85b97b18e45dd393feee1678457fc1b9", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "a29c82751b14f2693933ddbfc00c464fc3d78143f534024244e915880ed15760", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-s390x" + "sha256": "fc350527128f6ed0fb71baed1df0f905217c1ac90565be5b57c2a3d784de0e14", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "8748acb910d9e8e622ec6f89f9d82c3696ab3485ed7094d0e976506fba33b155", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-windows-x86_64.exe" + "sha256": "c889e8aeaa2e7ba0d4d4a41f6d9f106e22edfb6b3bd174339cefa69d016a740f", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "9d29c95609ed17aadefa4b4b9e1fec83931bc10239ea7b4ca0c0b6303eec4456", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-windows-aarch64.exe" + "sha256": "75cdf9408e9337ef76fbf091657d4e64167a9d616b0fa7c30d232d8c849d9dbd", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.10.2" + "version": "2.11.0" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 04ae082ff40c8d4be2d20f87041e9c71447f7af4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 14 Sep 2022 10:06:49 -0700 Subject: [PATCH 097/667] Update 22.06-rc to compose 2.11.0 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 ++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index c5ebd536e..c0fb02cbf 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.10.2 +ENV DOCKER_COMPOSE_VERSION 2.11.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-x86_64'; \ - sha256='41e9657c8abd7d656c3a40df1ae9c1171930313707a3abd5420ec8852b59eeb7'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-x86_64'; \ + sha256='e15e0d04bb2ae3885a375a575f27ebd79679f01df2dcb1257bd2c5afe1966122'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv6'; \ - sha256='56fe4280d29c8714ef63e3e8de039522b519a1cdcfb577c1c02c7c00f581e326'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv6'; \ + sha256='25b8aca3e61654be4324080ccb758f47a165c6028b57d2c4b4a0bae967274a4e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv7'; \ - sha256='709aa427507a3a064d822977d2b1d68a0bd78a114c714970033b5e6731f9879b'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv7'; \ + sha256='d13b829fc9637bbf291cd4c90ddc19da7d9c69e4788399641e01657f93208c9e'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-aarch64'; \ - sha256='dcac4e71c52264a795d0271b36cd6b2ea0ac266931618fab2e9e9a803ed16a4a'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-aarch64'; \ + sha256='26088a6f1afbb58c78b2d7a7eaa0ec36df59f9f45729843ca1031ec75472b6bc'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-ppc64le'; \ - sha256='5c1b7a13f39aa24d3369954f692aee776d9621a3cad4ddd513aa26918debd202'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-ppc64le'; \ + sha256='44334a3632c9a34a519860c1edc2f251addbcace694ec38f04a5d825358d9fd9'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-riscv64'; \ - sha256='4bf02048f307cf1e8b432c18aee33022be50562d52afbab09d28e90cbff9e900'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-riscv64'; \ + sha256='dd6cf7a96fec0abd69be360f525e21ae85b97b18e45dd393feee1678457fc1b9'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-s390x'; \ - sha256='a29c82751b14f2693933ddbfc00c464fc3d78143f534024244e915880ed15760'; \ + url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-s390x'; \ + sha256='fc350527128f6ed0fb71baed1df0f905217c1ac90565be5b57c2a3d784de0e14'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index ee84fc9d4..b984fd9f6 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "41e9657c8abd7d656c3a40df1ae9c1171930313707a3abd5420ec8852b59eeb7", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-x86_64" + "sha256": "e15e0d04bb2ae3885a375a575f27ebd79679f01df2dcb1257bd2c5afe1966122", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "56fe4280d29c8714ef63e3e8de039522b519a1cdcfb577c1c02c7c00f581e326", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv6" + "sha256": "25b8aca3e61654be4324080ccb758f47a165c6028b57d2c4b4a0bae967274a4e", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "709aa427507a3a064d822977d2b1d68a0bd78a114c714970033b5e6731f9879b", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-armv7" + "sha256": "d13b829fc9637bbf291cd4c90ddc19da7d9c69e4788399641e01657f93208c9e", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "dcac4e71c52264a795d0271b36cd6b2ea0ac266931618fab2e9e9a803ed16a4a", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-aarch64" + "sha256": "26088a6f1afbb58c78b2d7a7eaa0ec36df59f9f45729843ca1031ec75472b6bc", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "73ce29978c66d4c903393700f6cbeb60871c91d75cf7e528cb5a00ea10353534", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-darwin-x86_64" + "sha256": "8d5d3ce22e4b8904186bf117b17e77f39838703360175ccffd504eb6fb010b2d", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "f81629d52a43bf68e77f10abac96a0040643a05a382f6a11c1c6b77b614ae6a8", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-darwin-aarch64" + "sha256": "5af0a7ff9eea13bfe419ab15c6399292b9bde1b76298a6716d581addb167c7ed", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "5c1b7a13f39aa24d3369954f692aee776d9621a3cad4ddd513aa26918debd202", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-ppc64le" + "sha256": "44334a3632c9a34a519860c1edc2f251addbcace694ec38f04a5d825358d9fd9", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "4bf02048f307cf1e8b432c18aee33022be50562d52afbab09d28e90cbff9e900", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-riscv64" + "sha256": "dd6cf7a96fec0abd69be360f525e21ae85b97b18e45dd393feee1678457fc1b9", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "a29c82751b14f2693933ddbfc00c464fc3d78143f534024244e915880ed15760", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-linux-s390x" + "sha256": "fc350527128f6ed0fb71baed1df0f905217c1ac90565be5b57c2a3d784de0e14", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "8748acb910d9e8e622ec6f89f9d82c3696ab3485ed7094d0e976506fba33b155", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-windows-x86_64.exe" + "sha256": "c889e8aeaa2e7ba0d4d4a41f6d9f106e22edfb6b3bd174339cefa69d016a740f", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "9d29c95609ed17aadefa4b4b9e1fec83931bc10239ea7b4ca0c0b6303eec4456", - "url": "https://github.com/docker/compose/releases/download/v2.10.2/docker-compose-windows-aarch64.exe" + "sha256": "75cdf9408e9337ef76fbf091657d4e64167a9d616b0fa7c30d232d8c849d9dbd", + "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.10.2" + "version": "2.11.0" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 5e3e40486df3af0f9675c115a6127e10ac4f5b95 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 20 Sep 2022 04:04:16 -0700 Subject: [PATCH 098/667] Update 20.10 to compose 2.11.1 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 10ac62675..2833ba6c6 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.11.0 +ENV DOCKER_COMPOSE_VERSION 2.11.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-x86_64'; \ - sha256='e15e0d04bb2ae3885a375a575f27ebd79679f01df2dcb1257bd2c5afe1966122'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-x86_64'; \ + sha256='f44b91e9ce260c2080dd2929dc2da06068be7a84b730d31522ecd3c3178b1753'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv6'; \ - sha256='25b8aca3e61654be4324080ccb758f47a165c6028b57d2c4b4a0bae967274a4e'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv6'; \ + sha256='4d96bf75953f203f5f1fc5aadd091279c89a38c46e840391b46cbe85cac6dbbd'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv7'; \ - sha256='d13b829fc9637bbf291cd4c90ddc19da7d9c69e4788399641e01657f93208c9e'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv7'; \ + sha256='89776e1133ebca5c5e974b1fc42ac36799d4c7ab6a2d1a59f3a5ce30b017ce63'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-aarch64'; \ - sha256='26088a6f1afbb58c78b2d7a7eaa0ec36df59f9f45729843ca1031ec75472b6bc'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-aarch64'; \ + sha256='ee53340ff5fc9077ebfbf8302806d2e3ce717f762afcdbe601656e1fe9128bbe'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-ppc64le'; \ - sha256='44334a3632c9a34a519860c1edc2f251addbcace694ec38f04a5d825358d9fd9'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-ppc64le'; \ + sha256='63a3ca91cd6b8c45f68cec490c34b6233ae887e0d1e35408bb173bd24e5877cc'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-riscv64'; \ - sha256='dd6cf7a96fec0abd69be360f525e21ae85b97b18e45dd393feee1678457fc1b9'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-riscv64'; \ + sha256='2d6fcf2192fa0d3ae05b0501e1d3ff2420773885f61f612ab67fd07f6fa5bd3b'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-s390x'; \ - sha256='fc350527128f6ed0fb71baed1df0f905217c1ac90565be5b57c2a3d784de0e14'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-s390x'; \ + sha256='8e58e3f865ee9bef094d47ac5c11da7faeaf85a203cbdbc180196d18197f97f7'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index b984fd9f6..f9b8a126b 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e15e0d04bb2ae3885a375a575f27ebd79679f01df2dcb1257bd2c5afe1966122", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-x86_64" + "sha256": "f44b91e9ce260c2080dd2929dc2da06068be7a84b730d31522ecd3c3178b1753", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "25b8aca3e61654be4324080ccb758f47a165c6028b57d2c4b4a0bae967274a4e", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv6" + "sha256": "4d96bf75953f203f5f1fc5aadd091279c89a38c46e840391b46cbe85cac6dbbd", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d13b829fc9637bbf291cd4c90ddc19da7d9c69e4788399641e01657f93208c9e", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv7" + "sha256": "89776e1133ebca5c5e974b1fc42ac36799d4c7ab6a2d1a59f3a5ce30b017ce63", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "26088a6f1afbb58c78b2d7a7eaa0ec36df59f9f45729843ca1031ec75472b6bc", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-aarch64" + "sha256": "ee53340ff5fc9077ebfbf8302806d2e3ce717f762afcdbe601656e1fe9128bbe", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "8d5d3ce22e4b8904186bf117b17e77f39838703360175ccffd504eb6fb010b2d", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-darwin-x86_64" + "sha256": "3e4a91c4f99fc8e8a517b248c3c7c97464a85cdd156a7e6c9b3106d036f232d5", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5af0a7ff9eea13bfe419ab15c6399292b9bde1b76298a6716d581addb167c7ed", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-darwin-aarch64" + "sha256": "84492aae8b182cffe44f5e5ad2a8ef899303d517b54f72be7058f66f50e2a3fc", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "44334a3632c9a34a519860c1edc2f251addbcace694ec38f04a5d825358d9fd9", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-ppc64le" + "sha256": "63a3ca91cd6b8c45f68cec490c34b6233ae887e0d1e35408bb173bd24e5877cc", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "dd6cf7a96fec0abd69be360f525e21ae85b97b18e45dd393feee1678457fc1b9", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-riscv64" + "sha256": "2d6fcf2192fa0d3ae05b0501e1d3ff2420773885f61f612ab67fd07f6fa5bd3b", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "fc350527128f6ed0fb71baed1df0f905217c1ac90565be5b57c2a3d784de0e14", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-s390x" + "sha256": "8e58e3f865ee9bef094d47ac5c11da7faeaf85a203cbdbc180196d18197f97f7", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "c889e8aeaa2e7ba0d4d4a41f6d9f106e22edfb6b3bd174339cefa69d016a740f", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-windows-x86_64.exe" + "sha256": "a58c8271b52b753c3763f0c0e0c67abac6deb00d74c81c5e39991e31c8a0ef71", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "75cdf9408e9337ef76fbf091657d4e64167a9d616b0fa7c30d232d8c849d9dbd", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-windows-aarch64.exe" + "sha256": "43c135e74a01eda78cd451e326360ff817eef08644be11bf3bd06e98c64df097", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.11.0" + "version": "2.11.1" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 0eb3eda3afc958405489aeda90531e558eb9e475 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 20 Sep 2022 04:06:31 -0700 Subject: [PATCH 099/667] Update 22.06-rc to compose 2.11.1 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 ++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index c0fb02cbf..7e9f2e2b1 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.11.0 +ENV DOCKER_COMPOSE_VERSION 2.11.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-x86_64'; \ - sha256='e15e0d04bb2ae3885a375a575f27ebd79679f01df2dcb1257bd2c5afe1966122'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-x86_64'; \ + sha256='f44b91e9ce260c2080dd2929dc2da06068be7a84b730d31522ecd3c3178b1753'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv6'; \ - sha256='25b8aca3e61654be4324080ccb758f47a165c6028b57d2c4b4a0bae967274a4e'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv6'; \ + sha256='4d96bf75953f203f5f1fc5aadd091279c89a38c46e840391b46cbe85cac6dbbd'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv7'; \ - sha256='d13b829fc9637bbf291cd4c90ddc19da7d9c69e4788399641e01657f93208c9e'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv7'; \ + sha256='89776e1133ebca5c5e974b1fc42ac36799d4c7ab6a2d1a59f3a5ce30b017ce63'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-aarch64'; \ - sha256='26088a6f1afbb58c78b2d7a7eaa0ec36df59f9f45729843ca1031ec75472b6bc'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-aarch64'; \ + sha256='ee53340ff5fc9077ebfbf8302806d2e3ce717f762afcdbe601656e1fe9128bbe'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-ppc64le'; \ - sha256='44334a3632c9a34a519860c1edc2f251addbcace694ec38f04a5d825358d9fd9'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-ppc64le'; \ + sha256='63a3ca91cd6b8c45f68cec490c34b6233ae887e0d1e35408bb173bd24e5877cc'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-riscv64'; \ - sha256='dd6cf7a96fec0abd69be360f525e21ae85b97b18e45dd393feee1678457fc1b9'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-riscv64'; \ + sha256='2d6fcf2192fa0d3ae05b0501e1d3ff2420773885f61f612ab67fd07f6fa5bd3b'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-s390x'; \ - sha256='fc350527128f6ed0fb71baed1df0f905217c1ac90565be5b57c2a3d784de0e14'; \ + url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-s390x'; \ + sha256='8e58e3f865ee9bef094d47ac5c11da7faeaf85a203cbdbc180196d18197f97f7'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index f9b8a126b..72545d07d 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e15e0d04bb2ae3885a375a575f27ebd79679f01df2dcb1257bd2c5afe1966122", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-x86_64" + "sha256": "f44b91e9ce260c2080dd2929dc2da06068be7a84b730d31522ecd3c3178b1753", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "25b8aca3e61654be4324080ccb758f47a165c6028b57d2c4b4a0bae967274a4e", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv6" + "sha256": "4d96bf75953f203f5f1fc5aadd091279c89a38c46e840391b46cbe85cac6dbbd", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d13b829fc9637bbf291cd4c90ddc19da7d9c69e4788399641e01657f93208c9e", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-armv7" + "sha256": "89776e1133ebca5c5e974b1fc42ac36799d4c7ab6a2d1a59f3a5ce30b017ce63", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "26088a6f1afbb58c78b2d7a7eaa0ec36df59f9f45729843ca1031ec75472b6bc", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-aarch64" + "sha256": "ee53340ff5fc9077ebfbf8302806d2e3ce717f762afcdbe601656e1fe9128bbe", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "8d5d3ce22e4b8904186bf117b17e77f39838703360175ccffd504eb6fb010b2d", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-darwin-x86_64" + "sha256": "3e4a91c4f99fc8e8a517b248c3c7c97464a85cdd156a7e6c9b3106d036f232d5", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5af0a7ff9eea13bfe419ab15c6399292b9bde1b76298a6716d581addb167c7ed", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-darwin-aarch64" + "sha256": "84492aae8b182cffe44f5e5ad2a8ef899303d517b54f72be7058f66f50e2a3fc", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "44334a3632c9a34a519860c1edc2f251addbcace694ec38f04a5d825358d9fd9", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-ppc64le" + "sha256": "63a3ca91cd6b8c45f68cec490c34b6233ae887e0d1e35408bb173bd24e5877cc", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "dd6cf7a96fec0abd69be360f525e21ae85b97b18e45dd393feee1678457fc1b9", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-riscv64" + "sha256": "2d6fcf2192fa0d3ae05b0501e1d3ff2420773885f61f612ab67fd07f6fa5bd3b", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "fc350527128f6ed0fb71baed1df0f905217c1ac90565be5b57c2a3d784de0e14", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-linux-s390x" + "sha256": "8e58e3f865ee9bef094d47ac5c11da7faeaf85a203cbdbc180196d18197f97f7", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "c889e8aeaa2e7ba0d4d4a41f6d9f106e22edfb6b3bd174339cefa69d016a740f", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-windows-x86_64.exe" + "sha256": "a58c8271b52b753c3763f0c0e0c67abac6deb00d74c81c5e39991e31c8a0ef71", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "75cdf9408e9337ef76fbf091657d4e64167a9d616b0fa7c30d232d8c849d9dbd", - "url": "https://github.com/docker/compose/releases/download/v2.11.0/docker-compose-windows-aarch64.exe" + "sha256": "43c135e74a01eda78cd451e326360ff817eef08644be11bf3bd06e98c64df097", + "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.11.0" + "version": "2.11.1" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 2fc53e853187b5f5ba0c4696189ce7abc6b62a1d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 27 Sep 2022 16:04:13 -0700 Subject: [PATCH 100/667] Update 20.10 to compose 2.11.2 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 2833ba6c6..27a185ff3 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.11.1 +ENV DOCKER_COMPOSE_VERSION 2.11.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-x86_64'; \ - sha256='f44b91e9ce260c2080dd2929dc2da06068be7a84b730d31522ecd3c3178b1753'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-x86_64'; \ + sha256='1178848502b0771b96895febeb4b1736acd5019c4ed71a8efbabf6915185fe8a'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv6'; \ - sha256='4d96bf75953f203f5f1fc5aadd091279c89a38c46e840391b46cbe85cac6dbbd'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv6'; \ + sha256='3e863e83a2701b26e168118f30456c3bd2ec37886182fc3373a8fe460e714761'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv7'; \ - sha256='89776e1133ebca5c5e974b1fc42ac36799d4c7ab6a2d1a59f3a5ce30b017ce63'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv7'; \ + sha256='c133c194f36b3a6dcd552c4e32652f6ef7c22af258a6f14b414bf751aad3d2fd'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-aarch64'; \ - sha256='ee53340ff5fc9077ebfbf8302806d2e3ce717f762afcdbe601656e1fe9128bbe'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-aarch64'; \ + sha256='eb65ae4a4dd4de7dc767935c2bc49e3641d265df1273ea8f577cadb6bd9b4ebf'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-ppc64le'; \ - sha256='63a3ca91cd6b8c45f68cec490c34b6233ae887e0d1e35408bb173bd24e5877cc'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-ppc64le'; \ + sha256='24f65d215a198e33f3f1646ebabd6cae00eb6d2d3442b86c97d8198331350785'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-riscv64'; \ - sha256='2d6fcf2192fa0d3ae05b0501e1d3ff2420773885f61f612ab67fd07f6fa5bd3b'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-riscv64'; \ + sha256='14a3de648bfa75a33ee8ded1cc8d501cff10c9d1565aab3dd641cf7283e9b51a'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-s390x'; \ - sha256='8e58e3f865ee9bef094d47ac5c11da7faeaf85a203cbdbc180196d18197f97f7'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-s390x'; \ + sha256='08e8612dc7aa2d983c6c07c54e483cbc1ec089cfe9d7f790643dd8dbd30ee4f5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 72545d07d..51094f647 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "f44b91e9ce260c2080dd2929dc2da06068be7a84b730d31522ecd3c3178b1753", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-x86_64" + "sha256": "1178848502b0771b96895febeb4b1736acd5019c4ed71a8efbabf6915185fe8a", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4d96bf75953f203f5f1fc5aadd091279c89a38c46e840391b46cbe85cac6dbbd", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv6" + "sha256": "3e863e83a2701b26e168118f30456c3bd2ec37886182fc3373a8fe460e714761", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "89776e1133ebca5c5e974b1fc42ac36799d4c7ab6a2d1a59f3a5ce30b017ce63", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv7" + "sha256": "c133c194f36b3a6dcd552c4e32652f6ef7c22af258a6f14b414bf751aad3d2fd", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "ee53340ff5fc9077ebfbf8302806d2e3ce717f762afcdbe601656e1fe9128bbe", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-aarch64" + "sha256": "eb65ae4a4dd4de7dc767935c2bc49e3641d265df1273ea8f577cadb6bd9b4ebf", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "3e4a91c4f99fc8e8a517b248c3c7c97464a85cdd156a7e6c9b3106d036f232d5", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-darwin-x86_64" + "sha256": "bbe5a396200e523a157a65fd28a709420406ad9ecd3b998002c71041811adbc3", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "84492aae8b182cffe44f5e5ad2a8ef899303d517b54f72be7058f66f50e2a3fc", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-darwin-aarch64" + "sha256": "f8ab6143f796d85a2ef763d302894d05cdd3509d3b84aaa49e3d92770d5cb534", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "63a3ca91cd6b8c45f68cec490c34b6233ae887e0d1e35408bb173bd24e5877cc", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-ppc64le" + "sha256": "24f65d215a198e33f3f1646ebabd6cae00eb6d2d3442b86c97d8198331350785", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "2d6fcf2192fa0d3ae05b0501e1d3ff2420773885f61f612ab67fd07f6fa5bd3b", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-riscv64" + "sha256": "14a3de648bfa75a33ee8ded1cc8d501cff10c9d1565aab3dd641cf7283e9b51a", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "8e58e3f865ee9bef094d47ac5c11da7faeaf85a203cbdbc180196d18197f97f7", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-s390x" + "sha256": "08e8612dc7aa2d983c6c07c54e483cbc1ec089cfe9d7f790643dd8dbd30ee4f5", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "a58c8271b52b753c3763f0c0e0c67abac6deb00d74c81c5e39991e31c8a0ef71", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-windows-x86_64.exe" + "sha256": "32172ee7ddc9791e9d5f7e7f2e1467c59c3bdb8cd2eb625b3e2fda38b76c9ab7", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "43c135e74a01eda78cd451e326360ff817eef08644be11bf3bd06e98c64df097", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-windows-aarch64.exe" + "sha256": "56624d42543c97795b93bd08d767565f03e72180a0b708290012a7ceab4758eb", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.11.1" + "version": "2.11.2" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 9d962f884ebf8e098b772f47938bc8486c6b6f7b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 27 Sep 2022 16:06:41 -0700 Subject: [PATCH 101/667] Update 22.06-rc to compose 2.11.2 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 ++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 7e9f2e2b1..7be662688 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.11.1 +ENV DOCKER_COMPOSE_VERSION 2.11.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-x86_64'; \ - sha256='f44b91e9ce260c2080dd2929dc2da06068be7a84b730d31522ecd3c3178b1753'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-x86_64'; \ + sha256='1178848502b0771b96895febeb4b1736acd5019c4ed71a8efbabf6915185fe8a'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv6'; \ - sha256='4d96bf75953f203f5f1fc5aadd091279c89a38c46e840391b46cbe85cac6dbbd'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv6'; \ + sha256='3e863e83a2701b26e168118f30456c3bd2ec37886182fc3373a8fe460e714761'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv7'; \ - sha256='89776e1133ebca5c5e974b1fc42ac36799d4c7ab6a2d1a59f3a5ce30b017ce63'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv7'; \ + sha256='c133c194f36b3a6dcd552c4e32652f6ef7c22af258a6f14b414bf751aad3d2fd'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-aarch64'; \ - sha256='ee53340ff5fc9077ebfbf8302806d2e3ce717f762afcdbe601656e1fe9128bbe'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-aarch64'; \ + sha256='eb65ae4a4dd4de7dc767935c2bc49e3641d265df1273ea8f577cadb6bd9b4ebf'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-ppc64le'; \ - sha256='63a3ca91cd6b8c45f68cec490c34b6233ae887e0d1e35408bb173bd24e5877cc'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-ppc64le'; \ + sha256='24f65d215a198e33f3f1646ebabd6cae00eb6d2d3442b86c97d8198331350785'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-riscv64'; \ - sha256='2d6fcf2192fa0d3ae05b0501e1d3ff2420773885f61f612ab67fd07f6fa5bd3b'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-riscv64'; \ + sha256='14a3de648bfa75a33ee8ded1cc8d501cff10c9d1565aab3dd641cf7283e9b51a'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-s390x'; \ - sha256='8e58e3f865ee9bef094d47ac5c11da7faeaf85a203cbdbc180196d18197f97f7'; \ + url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-s390x'; \ + sha256='08e8612dc7aa2d983c6c07c54e483cbc1ec089cfe9d7f790643dd8dbd30ee4f5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 51094f647..94137b867 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "f44b91e9ce260c2080dd2929dc2da06068be7a84b730d31522ecd3c3178b1753", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-x86_64" + "sha256": "1178848502b0771b96895febeb4b1736acd5019c4ed71a8efbabf6915185fe8a", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4d96bf75953f203f5f1fc5aadd091279c89a38c46e840391b46cbe85cac6dbbd", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv6" + "sha256": "3e863e83a2701b26e168118f30456c3bd2ec37886182fc3373a8fe460e714761", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "89776e1133ebca5c5e974b1fc42ac36799d4c7ab6a2d1a59f3a5ce30b017ce63", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv7" + "sha256": "c133c194f36b3a6dcd552c4e32652f6ef7c22af258a6f14b414bf751aad3d2fd", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "ee53340ff5fc9077ebfbf8302806d2e3ce717f762afcdbe601656e1fe9128bbe", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-aarch64" + "sha256": "eb65ae4a4dd4de7dc767935c2bc49e3641d265df1273ea8f577cadb6bd9b4ebf", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "3e4a91c4f99fc8e8a517b248c3c7c97464a85cdd156a7e6c9b3106d036f232d5", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-darwin-x86_64" + "sha256": "bbe5a396200e523a157a65fd28a709420406ad9ecd3b998002c71041811adbc3", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "84492aae8b182cffe44f5e5ad2a8ef899303d517b54f72be7058f66f50e2a3fc", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-darwin-aarch64" + "sha256": "f8ab6143f796d85a2ef763d302894d05cdd3509d3b84aaa49e3d92770d5cb534", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "63a3ca91cd6b8c45f68cec490c34b6233ae887e0d1e35408bb173bd24e5877cc", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-ppc64le" + "sha256": "24f65d215a198e33f3f1646ebabd6cae00eb6d2d3442b86c97d8198331350785", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "2d6fcf2192fa0d3ae05b0501e1d3ff2420773885f61f612ab67fd07f6fa5bd3b", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-riscv64" + "sha256": "14a3de648bfa75a33ee8ded1cc8d501cff10c9d1565aab3dd641cf7283e9b51a", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "8e58e3f865ee9bef094d47ac5c11da7faeaf85a203cbdbc180196d18197f97f7", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-s390x" + "sha256": "08e8612dc7aa2d983c6c07c54e483cbc1ec089cfe9d7f790643dd8dbd30ee4f5", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "a58c8271b52b753c3763f0c0e0c67abac6deb00d74c81c5e39991e31c8a0ef71", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-windows-x86_64.exe" + "sha256": "32172ee7ddc9791e9d5f7e7f2e1467c59c3bdb8cd2eb625b3e2fda38b76c9ab7", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "43c135e74a01eda78cd451e326360ff817eef08644be11bf3bd06e98c64df097", - "url": "https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-windows-aarch64.exe" + "sha256": "56624d42543c97795b93bd08d767565f03e72180a0b708290012a7ceab4758eb", + "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.11.1" + "version": "2.11.2" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 5cf48189420b2efc1c597bc9a7c35a734948f7fb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 13 Oct 2022 15:07:53 -0700 Subject: [PATCH 102/667] Update 20.10 to 20.10.19 --- 20.10/cli/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/dind/Dockerfile | 8 ++++---- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 27a185ff3..acde64dcb 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -19,23 +19,23 @@ 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 20.10.18 +ENV DOCKER_VERSION 20.10.19 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.18.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.19.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.18.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.19.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.18.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.19.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.18.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.19.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 4dc7fcb7b..8b0fe52c4 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.18.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.19.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.18.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.19.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index d46b380c1..16fb51f06 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/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-20.10.18.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.19.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.18.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.19.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.18.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.19.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.18.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.19.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 614030c80..292ea134c 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.18 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.18.zip +ENV DOCKER_VERSION 20.10.19 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.19.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index bd5ddd6e2..34405b0e7 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.18 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.18.zip +ENV DOCKER_VERSION 20.10.19 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.19.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/versions.json b/versions.json index 94137b867..af2bc1321 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "20.10": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.18.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.18.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.19.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.19.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.18.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.19.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.18.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.19.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.18.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.18.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.19.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.19.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.18.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.19.zip" } }, "buildx": { @@ -138,7 +138,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.18" + "version": "20.10.19" }, "20.10-rc": null, "22.06": null, From 5a1069147dae4608588945617ff360b948dfb8ec Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 14 Oct 2022 17:16:12 -0700 Subject: [PATCH 103/667] Switch to "$GITHUB_OUTPUT"; update actions/checkout to v3 - https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands - https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-output-parameter --- .github/workflows/ci.yml | 6 +++--- .github/workflows/verify-templating.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 155ef3165..e105455ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,14 +18,14 @@ jobs: outputs: strategy: ${{ steps.generate-jobs.outputs.strategy }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - id: generate-jobs name: Generate Jobs run: | git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew strategy="$(~/bashbrew/scripts/github-actions/generate.sh)" + echo "strategy=$strategy" >> "$GITHUB_OUTPUT" jq . <<<"$strategy" # sanity check / debugging aid - echo "::set-output name=strategy::$strategy" test: needs: generate-jobs @@ -33,7 +33,7 @@ jobs: name: ${{ matrix.name }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Prepare Environment run: ${{ matrix.runs.prepare }} - name: Pull Dependencies diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml index 7e833f1c7..14497bec6 100644 --- a/.github/workflows/verify-templating.yml +++ b/.github/workflows/verify-templating.yml @@ -13,7 +13,7 @@ jobs: name: Check For Uncomitted Changes runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Apply Templates run: ./apply-templates.sh - name: Check Git Status From 266df93e022414c12609b6e15178eac664afb50f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Oct 2022 12:47:12 -0700 Subject: [PATCH 104/667] Update 20.10 to 20.10.20, compose 2.12.0 --- 20.10/cli/Dockerfile | 40 ++++++------ 20.10/dind-rootless/Dockerfile | 4 +- 20.10/dind/Dockerfile | 8 +-- .../windows/windowsservercore-1809/Dockerfile | 4 +- .../windowsservercore-ltsc2022/Dockerfile | 4 +- versions.json | 62 +++++++++---------- 6 files changed, 61 insertions(+), 61 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index acde64dcb..613039a34 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -19,23 +19,23 @@ 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 20.10.19 +ENV DOCKER_VERSION 20.10.20 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.19.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.20.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.19.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.20.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.19.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.20.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.19.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.20.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.11.2 +ENV DOCKER_COMPOSE_VERSION 2.12.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-x86_64'; \ - sha256='1178848502b0771b96895febeb4b1736acd5019c4ed71a8efbabf6915185fe8a'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-x86_64'; \ + sha256='2054f3a24cb6814b390bd22c95fa37af7675831e37776bb1473a29a912d48b4b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv6'; \ - sha256='3e863e83a2701b26e168118f30456c3bd2ec37886182fc3373a8fe460e714761'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv6'; \ + sha256='81e1d70b82873145faf802d3c8c46d5c35373d3665586d263ecf28a9df25a308'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv7'; \ - sha256='c133c194f36b3a6dcd552c4e32652f6ef7c22af258a6f14b414bf751aad3d2fd'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv7'; \ + sha256='63f94bcea4f2b6e9abeba90ac81620b1b0cab116b40890f0a68619fd26e3eb3f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-aarch64'; \ - sha256='eb65ae4a4dd4de7dc767935c2bc49e3641d265df1273ea8f577cadb6bd9b4ebf'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-aarch64'; \ + sha256='3708946bf5d78db23502e95a7ef1f716c16060e098b28acbe604a38b3ab3a51a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-ppc64le'; \ - sha256='24f65d215a198e33f3f1646ebabd6cae00eb6d2d3442b86c97d8198331350785'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-ppc64le'; \ + sha256='263c827f0222dee0738a38ada22d5a4776d4a46874f34c114d7975e24e8c7bbe'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-riscv64'; \ - sha256='14a3de648bfa75a33ee8ded1cc8d501cff10c9d1565aab3dd641cf7283e9b51a'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-riscv64'; \ + sha256='65c7c1cda3ab6de7fb8f9b12d67d63b94a1355cc014e4ce5c7504809cb8db2e8'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-s390x'; \ - sha256='08e8612dc7aa2d983c6c07c54e483cbc1ec089cfe9d7f790643dd8dbd30ee4f5'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-s390x'; \ + sha256='b8087688da06c3c95e0cb518880053783951b47e3757be24788e34d5617128e4'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 8b0fe52c4..058b4a5f5 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.19.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.20.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.19.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.20.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index 16fb51f06..c6b877d7c 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/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-20.10.19.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.20.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.19.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.20.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.19.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.20.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.19.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.20.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 292ea134c..5b1230169 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.19 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.19.zip +ENV DOCKER_VERSION 20.10.20 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.20.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index 34405b0e7..0dc5efa2e 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.19 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.19.zip +ENV DOCKER_VERSION 20.10.20 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.20.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/versions.json b/versions.json index af2bc1321..44501efce 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "20.10": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.19.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.19.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.20.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.20.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.19.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.20.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.19.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.20.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.19.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.19.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.20.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.20.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.19.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.20.zip" } }, "buildx": { @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "1178848502b0771b96895febeb4b1736acd5019c4ed71a8efbabf6915185fe8a", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-x86_64" + "sha256": "2054f3a24cb6814b390bd22c95fa37af7675831e37776bb1473a29a912d48b4b", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "3e863e83a2701b26e168118f30456c3bd2ec37886182fc3373a8fe460e714761", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv6" + "sha256": "81e1d70b82873145faf802d3c8c46d5c35373d3665586d263ecf28a9df25a308", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "c133c194f36b3a6dcd552c4e32652f6ef7c22af258a6f14b414bf751aad3d2fd", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv7" + "sha256": "63f94bcea4f2b6e9abeba90ac81620b1b0cab116b40890f0a68619fd26e3eb3f", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "eb65ae4a4dd4de7dc767935c2bc49e3641d265df1273ea8f577cadb6bd9b4ebf", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-aarch64" + "sha256": "3708946bf5d78db23502e95a7ef1f716c16060e098b28acbe604a38b3ab3a51a", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "bbe5a396200e523a157a65fd28a709420406ad9ecd3b998002c71041811adbc3", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-darwin-x86_64" + "sha256": "eafaecca03de812874b0a10744532393e2a50eb648f2aa9172971cbf9ddec533", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "f8ab6143f796d85a2ef763d302894d05cdd3509d3b84aaa49e3d92770d5cb534", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-darwin-aarch64" + "sha256": "c836ece12b6f3da68005b0c32fe94686fcd85584e6f8e7be30823165d352d415", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "24f65d215a198e33f3f1646ebabd6cae00eb6d2d3442b86c97d8198331350785", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-ppc64le" + "sha256": "263c827f0222dee0738a38ada22d5a4776d4a46874f34c114d7975e24e8c7bbe", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "14a3de648bfa75a33ee8ded1cc8d501cff10c9d1565aab3dd641cf7283e9b51a", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-riscv64" + "sha256": "65c7c1cda3ab6de7fb8f9b12d67d63b94a1355cc014e4ce5c7504809cb8db2e8", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "08e8612dc7aa2d983c6c07c54e483cbc1ec089cfe9d7f790643dd8dbd30ee4f5", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-s390x" + "sha256": "b8087688da06c3c95e0cb518880053783951b47e3757be24788e34d5617128e4", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "32172ee7ddc9791e9d5f7e7f2e1467c59c3bdb8cd2eb625b3e2fda38b76c9ab7", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-windows-x86_64.exe" + "sha256": "92b48727edf3918631c374ca0beac34c2c82c6c357d794131c7e05b55de256e6", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "56624d42543c97795b93bd08d767565f03e72180a0b708290012a7ceab4758eb", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-windows-aarch64.exe" + "sha256": "669ada00ab070a6343d178b3034a1247d1738f7e852ca1e918cd5c601251fe1d", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.11.2" + "version": "2.12.0" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ @@ -138,7 +138,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.19" + "version": "20.10.20" }, "20.10-rc": null, "22.06": null, From 4c2ed1a0c2cf937eadae4e4b16543063124009b3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Oct 2022 12:49:32 -0700 Subject: [PATCH 105/667] Update 22.06-rc to compose 2.12.0 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 ++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 7be662688..632141bd4 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.11.2 +ENV DOCKER_COMPOSE_VERSION 2.12.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-x86_64'; \ - sha256='1178848502b0771b96895febeb4b1736acd5019c4ed71a8efbabf6915185fe8a'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-x86_64'; \ + sha256='2054f3a24cb6814b390bd22c95fa37af7675831e37776bb1473a29a912d48b4b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv6'; \ - sha256='3e863e83a2701b26e168118f30456c3bd2ec37886182fc3373a8fe460e714761'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv6'; \ + sha256='81e1d70b82873145faf802d3c8c46d5c35373d3665586d263ecf28a9df25a308'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv7'; \ - sha256='c133c194f36b3a6dcd552c4e32652f6ef7c22af258a6f14b414bf751aad3d2fd'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv7'; \ + sha256='63f94bcea4f2b6e9abeba90ac81620b1b0cab116b40890f0a68619fd26e3eb3f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-aarch64'; \ - sha256='eb65ae4a4dd4de7dc767935c2bc49e3641d265df1273ea8f577cadb6bd9b4ebf'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-aarch64'; \ + sha256='3708946bf5d78db23502e95a7ef1f716c16060e098b28acbe604a38b3ab3a51a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-ppc64le'; \ - sha256='24f65d215a198e33f3f1646ebabd6cae00eb6d2d3442b86c97d8198331350785'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-ppc64le'; \ + sha256='263c827f0222dee0738a38ada22d5a4776d4a46874f34c114d7975e24e8c7bbe'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-riscv64'; \ - sha256='14a3de648bfa75a33ee8ded1cc8d501cff10c9d1565aab3dd641cf7283e9b51a'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-riscv64'; \ + sha256='65c7c1cda3ab6de7fb8f9b12d67d63b94a1355cc014e4ce5c7504809cb8db2e8'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-s390x'; \ - sha256='08e8612dc7aa2d983c6c07c54e483cbc1ec089cfe9d7f790643dd8dbd30ee4f5'; \ + url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-s390x'; \ + sha256='b8087688da06c3c95e0cb518880053783951b47e3757be24788e34d5617128e4'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 44501efce..0432912f4 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "1178848502b0771b96895febeb4b1736acd5019c4ed71a8efbabf6915185fe8a", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-x86_64" + "sha256": "2054f3a24cb6814b390bd22c95fa37af7675831e37776bb1473a29a912d48b4b", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "3e863e83a2701b26e168118f30456c3bd2ec37886182fc3373a8fe460e714761", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv6" + "sha256": "81e1d70b82873145faf802d3c8c46d5c35373d3665586d263ecf28a9df25a308", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "c133c194f36b3a6dcd552c4e32652f6ef7c22af258a6f14b414bf751aad3d2fd", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv7" + "sha256": "63f94bcea4f2b6e9abeba90ac81620b1b0cab116b40890f0a68619fd26e3eb3f", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "eb65ae4a4dd4de7dc767935c2bc49e3641d265df1273ea8f577cadb6bd9b4ebf", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-aarch64" + "sha256": "3708946bf5d78db23502e95a7ef1f716c16060e098b28acbe604a38b3ab3a51a", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "bbe5a396200e523a157a65fd28a709420406ad9ecd3b998002c71041811adbc3", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-darwin-x86_64" + "sha256": "eafaecca03de812874b0a10744532393e2a50eb648f2aa9172971cbf9ddec533", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "f8ab6143f796d85a2ef763d302894d05cdd3509d3b84aaa49e3d92770d5cb534", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-darwin-aarch64" + "sha256": "c836ece12b6f3da68005b0c32fe94686fcd85584e6f8e7be30823165d352d415", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "24f65d215a198e33f3f1646ebabd6cae00eb6d2d3442b86c97d8198331350785", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-ppc64le" + "sha256": "263c827f0222dee0738a38ada22d5a4776d4a46874f34c114d7975e24e8c7bbe", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "14a3de648bfa75a33ee8ded1cc8d501cff10c9d1565aab3dd641cf7283e9b51a", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-riscv64" + "sha256": "65c7c1cda3ab6de7fb8f9b12d67d63b94a1355cc014e4ce5c7504809cb8db2e8", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "08e8612dc7aa2d983c6c07c54e483cbc1ec089cfe9d7f790643dd8dbd30ee4f5", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-s390x" + "sha256": "b8087688da06c3c95e0cb518880053783951b47e3757be24788e34d5617128e4", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "32172ee7ddc9791e9d5f7e7f2e1467c59c3bdb8cd2eb625b3e2fda38b76c9ab7", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-windows-x86_64.exe" + "sha256": "92b48727edf3918631c374ca0beac34c2c82c6c357d794131c7e05b55de256e6", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "56624d42543c97795b93bd08d767565f03e72180a0b708290012a7ceab4758eb", - "url": "https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-windows-aarch64.exe" + "sha256": "669ada00ab070a6343d178b3034a1247d1738f7e852ca1e918cd5c601251fe1d", + "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.11.2" + "version": "2.12.0" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 542075a21b1aca10b088595b3c49c5b7c75b1789 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Oct 2022 10:04:16 -0700 Subject: [PATCH 106/667] Update 20.10 to compose 2.12.1 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 613039a34..7aa8e12c6 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.12.0 +ENV DOCKER_COMPOSE_VERSION 2.12.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-x86_64'; \ - sha256='2054f3a24cb6814b390bd22c95fa37af7675831e37776bb1473a29a912d48b4b'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-x86_64'; \ + sha256='e83b45a94d8453b2db550018ebe9fb663ac87abb56c5fb32e7f62717c64f4b20'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv6'; \ - sha256='81e1d70b82873145faf802d3c8c46d5c35373d3665586d263ecf28a9df25a308'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv6'; \ + sha256='924557a440695e9e47def1ea5fa94f916e5ed3cc627c4de59f15d8be2261ecc1'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv7'; \ - sha256='63f94bcea4f2b6e9abeba90ac81620b1b0cab116b40890f0a68619fd26e3eb3f'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv7'; \ + sha256='907e32cf1f4d27093f51a4600847bcf20817d13984c7f5f63484e9e18fc84448'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-aarch64'; \ - sha256='3708946bf5d78db23502e95a7ef1f716c16060e098b28acbe604a38b3ab3a51a'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-aarch64'; \ + sha256='efa8630c6fe56d050937e5fa3f9f7821054be94860eb8b2f0ca485f5a84e6474'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-ppc64le'; \ - sha256='263c827f0222dee0738a38ada22d5a4776d4a46874f34c114d7975e24e8c7bbe'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-ppc64le'; \ + sha256='1a3b718d38b2430c64193781ce911d949397f9a860b7c2bdf7ab8055df7cd661'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-riscv64'; \ - sha256='65c7c1cda3ab6de7fb8f9b12d67d63b94a1355cc014e4ce5c7504809cb8db2e8'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-riscv64'; \ + sha256='2d15535d6254352f5e65723b2eab6dd4167abadcd4b3a8e90f2a9efb856eb22c'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-s390x'; \ - sha256='b8087688da06c3c95e0cb518880053783951b47e3757be24788e34d5617128e4'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-s390x'; \ + sha256='6c02038a6e144abf3b762fb3328424541e668d9aa1c10cba8cefc7bdd02b9d30'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 0432912f4..b244cff0d 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "2054f3a24cb6814b390bd22c95fa37af7675831e37776bb1473a29a912d48b4b", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-x86_64" + "sha256": "e83b45a94d8453b2db550018ebe9fb663ac87abb56c5fb32e7f62717c64f4b20", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "81e1d70b82873145faf802d3c8c46d5c35373d3665586d263ecf28a9df25a308", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv6" + "sha256": "924557a440695e9e47def1ea5fa94f916e5ed3cc627c4de59f15d8be2261ecc1", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "63f94bcea4f2b6e9abeba90ac81620b1b0cab116b40890f0a68619fd26e3eb3f", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv7" + "sha256": "907e32cf1f4d27093f51a4600847bcf20817d13984c7f5f63484e9e18fc84448", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "3708946bf5d78db23502e95a7ef1f716c16060e098b28acbe604a38b3ab3a51a", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-aarch64" + "sha256": "efa8630c6fe56d050937e5fa3f9f7821054be94860eb8b2f0ca485f5a84e6474", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "eafaecca03de812874b0a10744532393e2a50eb648f2aa9172971cbf9ddec533", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-darwin-x86_64" + "sha256": "6fb61642b3d2d393f8207c445e255854f3b04b14df381859e4dc14ed6656cb3a", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "c836ece12b6f3da68005b0c32fe94686fcd85584e6f8e7be30823165d352d415", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-darwin-aarch64" + "sha256": "6e1865c57242b2eb18271eefe8deb25b150535cd5ebab011c93fa4f9f40ceff4", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "263c827f0222dee0738a38ada22d5a4776d4a46874f34c114d7975e24e8c7bbe", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-ppc64le" + "sha256": "1a3b718d38b2430c64193781ce911d949397f9a860b7c2bdf7ab8055df7cd661", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "65c7c1cda3ab6de7fb8f9b12d67d63b94a1355cc014e4ce5c7504809cb8db2e8", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-riscv64" + "sha256": "2d15535d6254352f5e65723b2eab6dd4167abadcd4b3a8e90f2a9efb856eb22c", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "b8087688da06c3c95e0cb518880053783951b47e3757be24788e34d5617128e4", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-s390x" + "sha256": "6c02038a6e144abf3b762fb3328424541e668d9aa1c10cba8cefc7bdd02b9d30", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "92b48727edf3918631c374ca0beac34c2c82c6c357d794131c7e05b55de256e6", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-windows-x86_64.exe" + "sha256": "280b6fc7352a68354425ecc6cafe1215fa36481a04c0bfdcf1a5a75ee7764886", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "669ada00ab070a6343d178b3034a1247d1738f7e852ca1e918cd5c601251fe1d", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-windows-aarch64.exe" + "sha256": "70fc8c6fd1aa3c92863fbda21430de52537873eb81648e6cae8d36f150eecae3", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.12.0" + "version": "2.12.1" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 0d847095b9d0a614ca0d66972127dea9435bf42c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Oct 2022 10:06:40 -0700 Subject: [PATCH 107/667] Update 22.06-rc to compose 2.12.1 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 ++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 632141bd4..944409abc 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.12.0 +ENV DOCKER_COMPOSE_VERSION 2.12.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-x86_64'; \ - sha256='2054f3a24cb6814b390bd22c95fa37af7675831e37776bb1473a29a912d48b4b'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-x86_64'; \ + sha256='e83b45a94d8453b2db550018ebe9fb663ac87abb56c5fb32e7f62717c64f4b20'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv6'; \ - sha256='81e1d70b82873145faf802d3c8c46d5c35373d3665586d263ecf28a9df25a308'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv6'; \ + sha256='924557a440695e9e47def1ea5fa94f916e5ed3cc627c4de59f15d8be2261ecc1'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv7'; \ - sha256='63f94bcea4f2b6e9abeba90ac81620b1b0cab116b40890f0a68619fd26e3eb3f'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv7'; \ + sha256='907e32cf1f4d27093f51a4600847bcf20817d13984c7f5f63484e9e18fc84448'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-aarch64'; \ - sha256='3708946bf5d78db23502e95a7ef1f716c16060e098b28acbe604a38b3ab3a51a'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-aarch64'; \ + sha256='efa8630c6fe56d050937e5fa3f9f7821054be94860eb8b2f0ca485f5a84e6474'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-ppc64le'; \ - sha256='263c827f0222dee0738a38ada22d5a4776d4a46874f34c114d7975e24e8c7bbe'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-ppc64le'; \ + sha256='1a3b718d38b2430c64193781ce911d949397f9a860b7c2bdf7ab8055df7cd661'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-riscv64'; \ - sha256='65c7c1cda3ab6de7fb8f9b12d67d63b94a1355cc014e4ce5c7504809cb8db2e8'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-riscv64'; \ + sha256='2d15535d6254352f5e65723b2eab6dd4167abadcd4b3a8e90f2a9efb856eb22c'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-s390x'; \ - sha256='b8087688da06c3c95e0cb518880053783951b47e3757be24788e34d5617128e4'; \ + url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-s390x'; \ + sha256='6c02038a6e144abf3b762fb3328424541e668d9aa1c10cba8cefc7bdd02b9d30'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index b244cff0d..58b88ace9 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "2054f3a24cb6814b390bd22c95fa37af7675831e37776bb1473a29a912d48b4b", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-x86_64" + "sha256": "e83b45a94d8453b2db550018ebe9fb663ac87abb56c5fb32e7f62717c64f4b20", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "81e1d70b82873145faf802d3c8c46d5c35373d3665586d263ecf28a9df25a308", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv6" + "sha256": "924557a440695e9e47def1ea5fa94f916e5ed3cc627c4de59f15d8be2261ecc1", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "63f94bcea4f2b6e9abeba90ac81620b1b0cab116b40890f0a68619fd26e3eb3f", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-armv7" + "sha256": "907e32cf1f4d27093f51a4600847bcf20817d13984c7f5f63484e9e18fc84448", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "3708946bf5d78db23502e95a7ef1f716c16060e098b28acbe604a38b3ab3a51a", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-aarch64" + "sha256": "efa8630c6fe56d050937e5fa3f9f7821054be94860eb8b2f0ca485f5a84e6474", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "eafaecca03de812874b0a10744532393e2a50eb648f2aa9172971cbf9ddec533", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-darwin-x86_64" + "sha256": "6fb61642b3d2d393f8207c445e255854f3b04b14df381859e4dc14ed6656cb3a", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "c836ece12b6f3da68005b0c32fe94686fcd85584e6f8e7be30823165d352d415", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-darwin-aarch64" + "sha256": "6e1865c57242b2eb18271eefe8deb25b150535cd5ebab011c93fa4f9f40ceff4", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "263c827f0222dee0738a38ada22d5a4776d4a46874f34c114d7975e24e8c7bbe", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-ppc64le" + "sha256": "1a3b718d38b2430c64193781ce911d949397f9a860b7c2bdf7ab8055df7cd661", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "65c7c1cda3ab6de7fb8f9b12d67d63b94a1355cc014e4ce5c7504809cb8db2e8", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-riscv64" + "sha256": "2d15535d6254352f5e65723b2eab6dd4167abadcd4b3a8e90f2a9efb856eb22c", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "b8087688da06c3c95e0cb518880053783951b47e3757be24788e34d5617128e4", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-linux-s390x" + "sha256": "6c02038a6e144abf3b762fb3328424541e668d9aa1c10cba8cefc7bdd02b9d30", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "92b48727edf3918631c374ca0beac34c2c82c6c357d794131c7e05b55de256e6", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-windows-x86_64.exe" + "sha256": "280b6fc7352a68354425ecc6cafe1215fa36481a04c0bfdcf1a5a75ee7764886", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "669ada00ab070a6343d178b3034a1247d1738f7e852ca1e918cd5c601251fe1d", - "url": "https://github.com/docker/compose/releases/download/v2.12.0/docker-compose-windows-aarch64.exe" + "sha256": "70fc8c6fd1aa3c92863fbda21430de52537873eb81648e6cae8d36f150eecae3", + "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.12.0" + "version": "2.12.1" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From c959f0b0277ca297ef53af8d070e8a73012fe3df Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Oct 2022 16:04:16 -0700 Subject: [PATCH 108/667] Update 20.10 to compose 2.12.2 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 7aa8e12c6..3cf2c615b 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.12.1 +ENV DOCKER_COMPOSE_VERSION 2.12.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-x86_64'; \ - sha256='e83b45a94d8453b2db550018ebe9fb663ac87abb56c5fb32e7f62717c64f4b20'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-x86_64'; \ + sha256='36d1728ce001c7f021294be43bdfa3f508038bb00886c34b0794f7731cc9bf4b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv6'; \ - sha256='924557a440695e9e47def1ea5fa94f916e5ed3cc627c4de59f15d8be2261ecc1'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv6'; \ + sha256='e384beeb08ca89e4aeae5c47c561c5d49905e170d453e59440252015833183af'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv7'; \ - sha256='907e32cf1f4d27093f51a4600847bcf20817d13984c7f5f63484e9e18fc84448'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv7'; \ + sha256='22cfe5b2eab86a4832f328049cafacc8e7d76c12185ea7bdff7e7c7ce42f5f10'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-aarch64'; \ - sha256='efa8630c6fe56d050937e5fa3f9f7821054be94860eb8b2f0ca485f5a84e6474'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-aarch64'; \ + sha256='a2c9819115df18ada4e6a68be37f6515121984189d379456bdfd53058e07128b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-ppc64le'; \ - sha256='1a3b718d38b2430c64193781ce911d949397f9a860b7c2bdf7ab8055df7cd661'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-ppc64le'; \ + sha256='155df9a23b30011ca5318ee4b2df436938c8cebe03d78c9b349998d1bec9ca79'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-riscv64'; \ - sha256='2d15535d6254352f5e65723b2eab6dd4167abadcd4b3a8e90f2a9efb856eb22c'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-riscv64'; \ + sha256='e6903410dbf2d8705dbc9984cbf235306c4f85f7dd84b21bc4ed042b6fed4667'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-s390x'; \ - sha256='6c02038a6e144abf3b762fb3328424541e668d9aa1c10cba8cefc7bdd02b9d30'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-s390x'; \ + sha256='b318a46c768efcc2a5344a859c9dd9b969e5aa0967af0454dd50152e307a3dc3'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 58b88ace9..e8f9f49f3 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e83b45a94d8453b2db550018ebe9fb663ac87abb56c5fb32e7f62717c64f4b20", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-x86_64" + "sha256": "36d1728ce001c7f021294be43bdfa3f508038bb00886c34b0794f7731cc9bf4b", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "924557a440695e9e47def1ea5fa94f916e5ed3cc627c4de59f15d8be2261ecc1", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv6" + "sha256": "e384beeb08ca89e4aeae5c47c561c5d49905e170d453e59440252015833183af", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "907e32cf1f4d27093f51a4600847bcf20817d13984c7f5f63484e9e18fc84448", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv7" + "sha256": "22cfe5b2eab86a4832f328049cafacc8e7d76c12185ea7bdff7e7c7ce42f5f10", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "efa8630c6fe56d050937e5fa3f9f7821054be94860eb8b2f0ca485f5a84e6474", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-aarch64" + "sha256": "a2c9819115df18ada4e6a68be37f6515121984189d379456bdfd53058e07128b", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "6fb61642b3d2d393f8207c445e255854f3b04b14df381859e4dc14ed6656cb3a", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-darwin-x86_64" + "sha256": "ba58570658fcf91a746e070f71c99c91459354bb3bc1e4f73d782d07aafa3ff0", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "6e1865c57242b2eb18271eefe8deb25b150535cd5ebab011c93fa4f9f40ceff4", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-darwin-aarch64" + "sha256": "9a3dc71d4acc5020bddcb8d00a3546986fc85b24309ba46365eb2b6f7558d803", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "1a3b718d38b2430c64193781ce911d949397f9a860b7c2bdf7ab8055df7cd661", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-ppc64le" + "sha256": "155df9a23b30011ca5318ee4b2df436938c8cebe03d78c9b349998d1bec9ca79", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "2d15535d6254352f5e65723b2eab6dd4167abadcd4b3a8e90f2a9efb856eb22c", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-riscv64" + "sha256": "e6903410dbf2d8705dbc9984cbf235306c4f85f7dd84b21bc4ed042b6fed4667", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6c02038a6e144abf3b762fb3328424541e668d9aa1c10cba8cefc7bdd02b9d30", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-s390x" + "sha256": "b318a46c768efcc2a5344a859c9dd9b969e5aa0967af0454dd50152e307a3dc3", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "280b6fc7352a68354425ecc6cafe1215fa36481a04c0bfdcf1a5a75ee7764886", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-windows-x86_64.exe" + "sha256": "0356b20170258be37295774b89a32b294dd524b646ec6df896026a82c43d6f62", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "70fc8c6fd1aa3c92863fbda21430de52537873eb81648e6cae8d36f150eecae3", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-windows-aarch64.exe" + "sha256": "302bafb2823fa7ee26fe82fce3c77dc4f713fda1dff3c4d193ce0bee6b91e28c", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.12.1" + "version": "2.12.2" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 932221bc0570ff70b6ca56cafbf2fb5b5dd00eba Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Oct 2022 16:06:35 -0700 Subject: [PATCH 109/667] Update 22.06-rc to compose 2.12.2 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 ++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 944409abc..f8dc15a94 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.12.1 +ENV DOCKER_COMPOSE_VERSION 2.12.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-x86_64'; \ - sha256='e83b45a94d8453b2db550018ebe9fb663ac87abb56c5fb32e7f62717c64f4b20'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-x86_64'; \ + sha256='36d1728ce001c7f021294be43bdfa3f508038bb00886c34b0794f7731cc9bf4b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv6'; \ - sha256='924557a440695e9e47def1ea5fa94f916e5ed3cc627c4de59f15d8be2261ecc1'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv6'; \ + sha256='e384beeb08ca89e4aeae5c47c561c5d49905e170d453e59440252015833183af'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv7'; \ - sha256='907e32cf1f4d27093f51a4600847bcf20817d13984c7f5f63484e9e18fc84448'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv7'; \ + sha256='22cfe5b2eab86a4832f328049cafacc8e7d76c12185ea7bdff7e7c7ce42f5f10'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-aarch64'; \ - sha256='efa8630c6fe56d050937e5fa3f9f7821054be94860eb8b2f0ca485f5a84e6474'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-aarch64'; \ + sha256='a2c9819115df18ada4e6a68be37f6515121984189d379456bdfd53058e07128b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-ppc64le'; \ - sha256='1a3b718d38b2430c64193781ce911d949397f9a860b7c2bdf7ab8055df7cd661'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-ppc64le'; \ + sha256='155df9a23b30011ca5318ee4b2df436938c8cebe03d78c9b349998d1bec9ca79'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-riscv64'; \ - sha256='2d15535d6254352f5e65723b2eab6dd4167abadcd4b3a8e90f2a9efb856eb22c'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-riscv64'; \ + sha256='e6903410dbf2d8705dbc9984cbf235306c4f85f7dd84b21bc4ed042b6fed4667'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-s390x'; \ - sha256='6c02038a6e144abf3b762fb3328424541e668d9aa1c10cba8cefc7bdd02b9d30'; \ + url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-s390x'; \ + sha256='b318a46c768efcc2a5344a859c9dd9b969e5aa0967af0454dd50152e307a3dc3'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index e8f9f49f3..741bd7e18 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e83b45a94d8453b2db550018ebe9fb663ac87abb56c5fb32e7f62717c64f4b20", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-x86_64" + "sha256": "36d1728ce001c7f021294be43bdfa3f508038bb00886c34b0794f7731cc9bf4b", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "924557a440695e9e47def1ea5fa94f916e5ed3cc627c4de59f15d8be2261ecc1", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv6" + "sha256": "e384beeb08ca89e4aeae5c47c561c5d49905e170d453e59440252015833183af", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "907e32cf1f4d27093f51a4600847bcf20817d13984c7f5f63484e9e18fc84448", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-armv7" + "sha256": "22cfe5b2eab86a4832f328049cafacc8e7d76c12185ea7bdff7e7c7ce42f5f10", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "efa8630c6fe56d050937e5fa3f9f7821054be94860eb8b2f0ca485f5a84e6474", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-aarch64" + "sha256": "a2c9819115df18ada4e6a68be37f6515121984189d379456bdfd53058e07128b", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "6fb61642b3d2d393f8207c445e255854f3b04b14df381859e4dc14ed6656cb3a", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-darwin-x86_64" + "sha256": "ba58570658fcf91a746e070f71c99c91459354bb3bc1e4f73d782d07aafa3ff0", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "6e1865c57242b2eb18271eefe8deb25b150535cd5ebab011c93fa4f9f40ceff4", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-darwin-aarch64" + "sha256": "9a3dc71d4acc5020bddcb8d00a3546986fc85b24309ba46365eb2b6f7558d803", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "1a3b718d38b2430c64193781ce911d949397f9a860b7c2bdf7ab8055df7cd661", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-ppc64le" + "sha256": "155df9a23b30011ca5318ee4b2df436938c8cebe03d78c9b349998d1bec9ca79", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "2d15535d6254352f5e65723b2eab6dd4167abadcd4b3a8e90f2a9efb856eb22c", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-riscv64" + "sha256": "e6903410dbf2d8705dbc9984cbf235306c4f85f7dd84b21bc4ed042b6fed4667", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6c02038a6e144abf3b762fb3328424541e668d9aa1c10cba8cefc7bdd02b9d30", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-linux-s390x" + "sha256": "b318a46c768efcc2a5344a859c9dd9b969e5aa0967af0454dd50152e307a3dc3", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "280b6fc7352a68354425ecc6cafe1215fa36481a04c0bfdcf1a5a75ee7764886", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-windows-x86_64.exe" + "sha256": "0356b20170258be37295774b89a32b294dd524b646ec6df896026a82c43d6f62", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "70fc8c6fd1aa3c92863fbda21430de52537873eb81648e6cae8d36f150eecae3", - "url": "https://github.com/docker/compose/releases/download/v2.12.1/docker-compose-windows-aarch64.exe" + "sha256": "302bafb2823fa7ee26fe82fce3c77dc4f713fda1dff3c4d193ce0bee6b91e28c", + "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.12.1" + "version": "2.12.2" }, "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", "variants": [ From 1231bb8e025bdc715b8a8ca122ad20b5cf7ee469 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 25 Oct 2022 15:00:36 -0700 Subject: [PATCH 110/667] Update 20.10 to 20.10.21 --- 20.10/cli/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/dind/Dockerfile | 8 ++++---- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 3cf2c615b..7332ae900 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -19,23 +19,23 @@ 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 20.10.20 +ENV DOCKER_VERSION 20.10.21 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.20.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.21.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.20.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.21.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.20.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.21.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.20.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.21.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 058b4a5f5..081215985 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.20.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.21.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.20.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.21.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index c6b877d7c..f564ba951 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/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-20.10.20.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.21.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.20.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.21.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.20.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.21.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.20.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.21.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 5b1230169..23ae361d4 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.20 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.20.zip +ENV DOCKER_VERSION 20.10.21 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.21.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index 0dc5efa2e..13ae524da 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.20 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.20.zip +ENV DOCKER_VERSION 20.10.21 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.21.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/versions.json b/versions.json index 741bd7e18..772441654 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "20.10": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.20.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.20.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.21.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.21.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.20.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.21.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.20.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.21.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.20.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.20.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.21.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.21.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.20.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.21.zip" } }, "buildx": { @@ -138,7 +138,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.20" + "version": "20.10.21" }, "20.10-rc": null, "22.06": null, From fbd3c1d965c8587efde1bef2d31459e54c28372e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 11 Nov 2022 16:04:28 -0800 Subject: [PATCH 111/667] Update 22.06-rc --- 22.06-rc/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/22.06-rc/dind/Dockerfile b/22.06-rc/dind/Dockerfile index a3cd746e6..d0d34b270 100644 --- a/22.06-rc/dind/Dockerfile +++ b/22.06-rc/dind/Dockerfile @@ -74,7 +74,7 @@ RUN set -eux; \ runc --version # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 +ENV DIND_COMMIT 1f32e3c95d72a29b3eaacba156ed675dba976cb5 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index 772441654..9643d4a32 100644 --- a/versions.json +++ b/versions.json @@ -272,7 +272,7 @@ }, "version": "2.12.2" }, - "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", + "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ "cli", "dind", From 6028daf0c4c6f93606e961346ca1cf8226745312 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Mon, 14 Nov 2022 13:51:36 -0800 Subject: [PATCH 112/667] Swap netgo prep to check instead of create --- 20.10/cli/Dockerfile | 8 ++++---- 22.06-rc/cli/Dockerfile | 8 ++++---- Dockerfile-cli.template | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 7332ae900..6c80dbcfa 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -13,11 +13,11 @@ RUN apk add --no-cache \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client -# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149 -# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v20.10.21/hack/make.sh#L115 +# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303 # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf ENV DOCKER_VERSION 20.10.21 diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index f8dc15a94..59a1edef3 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -13,11 +13,11 @@ RUN apk add --no-cache \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client -# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149 -# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v20.10.21/hack/make.sh#L115 +# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303 # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf ENV DOCKER_VERSION 22.06.0-beta.0 diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 64d7afd97..6ee0af57d 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -8,11 +8,11 @@ RUN apk add --no-cache \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client -# set up nsswitch.conf for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/engine/hack/make.sh#L149 -# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v20.10.21/hack/make.sh#L115 +# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303 # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf ENV DOCKER_VERSION {{ .version }} From 75036d19c3d68de7d20277d707763f32ddd487aa Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 14 Nov 2022 16:04:17 -0800 Subject: [PATCH 113/667] Update 20.10 --- 20.10/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index f564ba951..592a4acf5 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/Dockerfile @@ -74,7 +74,7 @@ RUN set -eux; \ runc --version # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 42b1175eda071c0e9121e1d64345928384a93df1 +ENV DIND_COMMIT 1f32e3c95d72a29b3eaacba156ed675dba976cb5 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index 9643d4a32..3d2550b2a 100644 --- a/versions.json +++ b/versions.json @@ -129,7 +129,7 @@ }, "version": "2.12.2" }, - "dindCommit": "42b1175eda071c0e9121e1d64345928384a93df1", + "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ "cli", "dind", From 5aade2cc90a50a20f0c7071931b53863e5d272a3 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 16 Nov 2022 13:56:37 -0800 Subject: [PATCH 114/667] Use new "bashbrew" composite action --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e105455ad..3860c115c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,11 +19,11 @@ jobs: strategy: ${{ steps.generate-jobs.outputs.strategy }} steps: - uses: actions/checkout@v3 + - uses: docker-library/bashbrew@HEAD - id: generate-jobs name: Generate Jobs run: | - git clone --depth 1 https://github.com/docker-library/bashbrew.git -b master ~/bashbrew - strategy="$(~/bashbrew/scripts/github-actions/generate.sh)" + strategy="$("$BASHBREW_SCRIPTS/github-actions/generate.sh")" echo "strategy=$strategy" >> "$GITHUB_OUTPUT" jq . <<<"$strategy" # sanity check / debugging aid From dcf98897e607983df61d3711f46a3f1eac8b44d8 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 23 Nov 2022 11:27:35 +0100 Subject: [PATCH 115/667] Update to Alpine 3.17 --- 20.10/cli/Dockerfile | 2 +- 22.06-rc/cli/Dockerfile | 2 +- Dockerfile-cli.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 6c80dbcfa..c45301226 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.17 RUN apk add --no-cache \ ca-certificates \ diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 59a1edef3..b80d203df 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.16 +FROM alpine:3.17 RUN apk add --no-cache \ ca-certificates \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 6ee0af57d..f44a9d231 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -1,5 +1,5 @@ {{ include "shared" -}} -FROM alpine:3.16 +FROM alpine:3.17 RUN apk add --no-cache \ ca-certificates \ From fe5898c67f2b7690abeb838cbf2d9ae2a7ac6940 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 23 Nov 2022 10:04:16 -0800 Subject: [PATCH 116/667] Update 20.10 to compose 2.13.0 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 6c80dbcfa..b674eb311 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.12.2 +ENV DOCKER_COMPOSE_VERSION 2.13.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-x86_64'; \ - sha256='36d1728ce001c7f021294be43bdfa3f508038bb00886c34b0794f7731cc9bf4b'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-x86_64'; \ + sha256='943ff254867e1c23cd6414d7255790daddc7ab69013dd79ba5c172410cbafb14'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv6'; \ - sha256='e384beeb08ca89e4aeae5c47c561c5d49905e170d453e59440252015833183af'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv6'; \ + sha256='c188afabb4565145beaf3ccd025d04428f7ba543616fb7042190d267ffb3df77'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv7'; \ - sha256='22cfe5b2eab86a4832f328049cafacc8e7d76c12185ea7bdff7e7c7ce42f5f10'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv7'; \ + sha256='7f985bf4b61f70b17a3c7da2d4cedb7e8fb13bc7c67d5e6e2fd23dd28212d61a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-aarch64'; \ - sha256='a2c9819115df18ada4e6a68be37f6515121984189d379456bdfd53058e07128b'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-aarch64'; \ + sha256='4a920b7d5fe5011dd466fa87ea3b47ee5f224b5770337188daee359ec606eb20'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-ppc64le'; \ - sha256='155df9a23b30011ca5318ee4b2df436938c8cebe03d78c9b349998d1bec9ca79'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-ppc64le'; \ + sha256='2aaa046eb055d2b0ccbdeac2c22f2bf927adb4c328b912a458686bf0861322d1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-riscv64'; \ - sha256='e6903410dbf2d8705dbc9984cbf235306c4f85f7dd84b21bc4ed042b6fed4667'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-riscv64'; \ + sha256='f8690e1c715a1bd87316cdd4e1ba1c0144f02eaa9f037075a471d926af133306'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-s390x'; \ - sha256='b318a46c768efcc2a5344a859c9dd9b969e5aa0967af0454dd50152e307a3dc3'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-s390x'; \ + sha256='e48830b80893ac41d8f7198f6660f23c24c4a7cde3b95593e534ff7bb3ee0a03'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 3d2550b2a..f2f404037 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "36d1728ce001c7f021294be43bdfa3f508038bb00886c34b0794f7731cc9bf4b", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-x86_64" + "sha256": "943ff254867e1c23cd6414d7255790daddc7ab69013dd79ba5c172410cbafb14", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e384beeb08ca89e4aeae5c47c561c5d49905e170d453e59440252015833183af", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv6" + "sha256": "c188afabb4565145beaf3ccd025d04428f7ba543616fb7042190d267ffb3df77", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "22cfe5b2eab86a4832f328049cafacc8e7d76c12185ea7bdff7e7c7ce42f5f10", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv7" + "sha256": "7f985bf4b61f70b17a3c7da2d4cedb7e8fb13bc7c67d5e6e2fd23dd28212d61a", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "a2c9819115df18ada4e6a68be37f6515121984189d379456bdfd53058e07128b", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-aarch64" + "sha256": "4a920b7d5fe5011dd466fa87ea3b47ee5f224b5770337188daee359ec606eb20", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "ba58570658fcf91a746e070f71c99c91459354bb3bc1e4f73d782d07aafa3ff0", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-darwin-x86_64" + "sha256": "611df7b061e53c46c8d6d50a19ba096478d79613210f12a0f1186b5d088a2e16", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "9a3dc71d4acc5020bddcb8d00a3546986fc85b24309ba46365eb2b6f7558d803", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-darwin-aarch64" + "sha256": "2954e0e42746a46a5a1add39af01b09e4fb607ae140aa4ddb07197023675821b", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "155df9a23b30011ca5318ee4b2df436938c8cebe03d78c9b349998d1bec9ca79", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-ppc64le" + "sha256": "2aaa046eb055d2b0ccbdeac2c22f2bf927adb4c328b912a458686bf0861322d1", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e6903410dbf2d8705dbc9984cbf235306c4f85f7dd84b21bc4ed042b6fed4667", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-riscv64" + "sha256": "f8690e1c715a1bd87316cdd4e1ba1c0144f02eaa9f037075a471d926af133306", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "b318a46c768efcc2a5344a859c9dd9b969e5aa0967af0454dd50152e307a3dc3", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-s390x" + "sha256": "e48830b80893ac41d8f7198f6660f23c24c4a7cde3b95593e534ff7bb3ee0a03", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0356b20170258be37295774b89a32b294dd524b646ec6df896026a82c43d6f62", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-windows-x86_64.exe" + "sha256": "09f099b74dcb566a5d77c46d3e8e6061640bbec3c6f329c7863040a933d2d358", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "302bafb2823fa7ee26fe82fce3c77dc4f713fda1dff3c4d193ce0bee6b91e28c", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-windows-aarch64.exe" + "sha256": "1d466f6a509ff4806edfc96e2ce981802a750d1a643e94f64bf9d6fbf4cd92cc", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.12.2" + "version": "2.13.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 8ba2b983843bb244ecaf8ae6c1e6e13ece51dd20 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 23 Nov 2022 10:06:35 -0800 Subject: [PATCH 117/667] Update 22.06-rc to compose 2.13.0 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 ++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index 59a1edef3..7bda324e5 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.12.2 +ENV DOCKER_COMPOSE_VERSION 2.13.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-x86_64'; \ - sha256='36d1728ce001c7f021294be43bdfa3f508038bb00886c34b0794f7731cc9bf4b'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-x86_64'; \ + sha256='943ff254867e1c23cd6414d7255790daddc7ab69013dd79ba5c172410cbafb14'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv6'; \ - sha256='e384beeb08ca89e4aeae5c47c561c5d49905e170d453e59440252015833183af'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv6'; \ + sha256='c188afabb4565145beaf3ccd025d04428f7ba543616fb7042190d267ffb3df77'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv7'; \ - sha256='22cfe5b2eab86a4832f328049cafacc8e7d76c12185ea7bdff7e7c7ce42f5f10'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv7'; \ + sha256='7f985bf4b61f70b17a3c7da2d4cedb7e8fb13bc7c67d5e6e2fd23dd28212d61a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-aarch64'; \ - sha256='a2c9819115df18ada4e6a68be37f6515121984189d379456bdfd53058e07128b'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-aarch64'; \ + sha256='4a920b7d5fe5011dd466fa87ea3b47ee5f224b5770337188daee359ec606eb20'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-ppc64le'; \ - sha256='155df9a23b30011ca5318ee4b2df436938c8cebe03d78c9b349998d1bec9ca79'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-ppc64le'; \ + sha256='2aaa046eb055d2b0ccbdeac2c22f2bf927adb4c328b912a458686bf0861322d1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-riscv64'; \ - sha256='e6903410dbf2d8705dbc9984cbf235306c4f85f7dd84b21bc4ed042b6fed4667'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-riscv64'; \ + sha256='f8690e1c715a1bd87316cdd4e1ba1c0144f02eaa9f037075a471d926af133306'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-s390x'; \ - sha256='b318a46c768efcc2a5344a859c9dd9b969e5aa0967af0454dd50152e307a3dc3'; \ + url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-s390x'; \ + sha256='e48830b80893ac41d8f7198f6660f23c24c4a7cde3b95593e534ff7bb3ee0a03'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index f2f404037..5d0236f6c 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "36d1728ce001c7f021294be43bdfa3f508038bb00886c34b0794f7731cc9bf4b", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-x86_64" + "sha256": "943ff254867e1c23cd6414d7255790daddc7ab69013dd79ba5c172410cbafb14", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e384beeb08ca89e4aeae5c47c561c5d49905e170d453e59440252015833183af", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv6" + "sha256": "c188afabb4565145beaf3ccd025d04428f7ba543616fb7042190d267ffb3df77", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "22cfe5b2eab86a4832f328049cafacc8e7d76c12185ea7bdff7e7c7ce42f5f10", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-armv7" + "sha256": "7f985bf4b61f70b17a3c7da2d4cedb7e8fb13bc7c67d5e6e2fd23dd28212d61a", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "a2c9819115df18ada4e6a68be37f6515121984189d379456bdfd53058e07128b", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-aarch64" + "sha256": "4a920b7d5fe5011dd466fa87ea3b47ee5f224b5770337188daee359ec606eb20", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "ba58570658fcf91a746e070f71c99c91459354bb3bc1e4f73d782d07aafa3ff0", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-darwin-x86_64" + "sha256": "611df7b061e53c46c8d6d50a19ba096478d79613210f12a0f1186b5d088a2e16", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "9a3dc71d4acc5020bddcb8d00a3546986fc85b24309ba46365eb2b6f7558d803", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-darwin-aarch64" + "sha256": "2954e0e42746a46a5a1add39af01b09e4fb607ae140aa4ddb07197023675821b", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "155df9a23b30011ca5318ee4b2df436938c8cebe03d78c9b349998d1bec9ca79", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-ppc64le" + "sha256": "2aaa046eb055d2b0ccbdeac2c22f2bf927adb4c328b912a458686bf0861322d1", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e6903410dbf2d8705dbc9984cbf235306c4f85f7dd84b21bc4ed042b6fed4667", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-riscv64" + "sha256": "f8690e1c715a1bd87316cdd4e1ba1c0144f02eaa9f037075a471d926af133306", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "b318a46c768efcc2a5344a859c9dd9b969e5aa0967af0454dd50152e307a3dc3", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-linux-s390x" + "sha256": "e48830b80893ac41d8f7198f6660f23c24c4a7cde3b95593e534ff7bb3ee0a03", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0356b20170258be37295774b89a32b294dd524b646ec6df896026a82c43d6f62", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-windows-x86_64.exe" + "sha256": "09f099b74dcb566a5d77c46d3e8e6061640bbec3c6f329c7863040a933d2d358", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "302bafb2823fa7ee26fe82fce3c77dc4f713fda1dff3c4d193ce0bee6b91e28c", - "url": "https://github.com/docker/compose/releases/download/v2.12.2/docker-compose-windows-aarch64.exe" + "sha256": "1d466f6a509ff4806edfc96e2ce981802a750d1a643e94f64bf9d6fbf4cd92cc", + "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.12.2" + "version": "2.13.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From d07d0bccbb31c1272ca7734a31d7ffa9e2a423aa Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Dec 2022 16:04:14 -0800 Subject: [PATCH 118/667] Update 20.10 to compose 2.14.0 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 0aeb1607b..e6b85d274 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.13.0 +ENV DOCKER_COMPOSE_VERSION 2.14.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-x86_64'; \ - sha256='943ff254867e1c23cd6414d7255790daddc7ab69013dd79ba5c172410cbafb14'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-x86_64'; \ + sha256='fdf634ab2b01aca33372bef2bf866699ef2e1f2dab19972e37967b1fc2a11402'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv6'; \ - sha256='c188afabb4565145beaf3ccd025d04428f7ba543616fb7042190d267ffb3df77'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv6'; \ + sha256='63e0826ddebc1ae776f38ab872b41f68b48fca246cdf67c709e07eef543cdf88'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv7'; \ - sha256='7f985bf4b61f70b17a3c7da2d4cedb7e8fb13bc7c67d5e6e2fd23dd28212d61a'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv7'; \ + sha256='c1664c4dcefc2a56a4f16f4dbd76e531f237bfbf713b90d3acea50df42a1aada'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-aarch64'; \ - sha256='4a920b7d5fe5011dd466fa87ea3b47ee5f224b5770337188daee359ec606eb20'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-aarch64'; \ + sha256='0265f45b30f4f0e1d53c1968c590181f64c546129d967460de382c6de38af191'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-ppc64le'; \ - sha256='2aaa046eb055d2b0ccbdeac2c22f2bf927adb4c328b912a458686bf0861322d1'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-ppc64le'; \ + sha256='dbee58426af567787e5c1d14e925cca0d0a958edc55203c4b29c10dda8e27355'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-riscv64'; \ - sha256='f8690e1c715a1bd87316cdd4e1ba1c0144f02eaa9f037075a471d926af133306'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-riscv64'; \ + sha256='d447a75ff4d900b19d40e0c69811b335518f8a5fbc6377e0aff25a3b999a8c49'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-s390x'; \ - sha256='e48830b80893ac41d8f7198f6660f23c24c4a7cde3b95593e534ff7bb3ee0a03'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-s390x'; \ + sha256='2c5bbb6513d7377919bd4189f25d8bf5d8706a5345f10609d8c49d5cf4d8ab88'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 5d0236f6c..aaa49729a 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "943ff254867e1c23cd6414d7255790daddc7ab69013dd79ba5c172410cbafb14", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-x86_64" + "sha256": "fdf634ab2b01aca33372bef2bf866699ef2e1f2dab19972e37967b1fc2a11402", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "c188afabb4565145beaf3ccd025d04428f7ba543616fb7042190d267ffb3df77", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv6" + "sha256": "63e0826ddebc1ae776f38ab872b41f68b48fca246cdf67c709e07eef543cdf88", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "7f985bf4b61f70b17a3c7da2d4cedb7e8fb13bc7c67d5e6e2fd23dd28212d61a", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv7" + "sha256": "c1664c4dcefc2a56a4f16f4dbd76e531f237bfbf713b90d3acea50df42a1aada", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "4a920b7d5fe5011dd466fa87ea3b47ee5f224b5770337188daee359ec606eb20", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-aarch64" + "sha256": "0265f45b30f4f0e1d53c1968c590181f64c546129d967460de382c6de38af191", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "611df7b061e53c46c8d6d50a19ba096478d79613210f12a0f1186b5d088a2e16", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-darwin-x86_64" + "sha256": "7171ad9b6bd79d7398d863e7227226a408e87cf03bbbd9a004c3a1b8b1643ef7", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "2954e0e42746a46a5a1add39af01b09e4fb607ae140aa4ddb07197023675821b", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-darwin-aarch64" + "sha256": "08766750383f30e80c21826f8f3de6add30625a97e927b6143d615c7da6ce739", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "2aaa046eb055d2b0ccbdeac2c22f2bf927adb4c328b912a458686bf0861322d1", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-ppc64le" + "sha256": "dbee58426af567787e5c1d14e925cca0d0a958edc55203c4b29c10dda8e27355", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "f8690e1c715a1bd87316cdd4e1ba1c0144f02eaa9f037075a471d926af133306", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-riscv64" + "sha256": "d447a75ff4d900b19d40e0c69811b335518f8a5fbc6377e0aff25a3b999a8c49", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "e48830b80893ac41d8f7198f6660f23c24c4a7cde3b95593e534ff7bb3ee0a03", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-s390x" + "sha256": "2c5bbb6513d7377919bd4189f25d8bf5d8706a5345f10609d8c49d5cf4d8ab88", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "09f099b74dcb566a5d77c46d3e8e6061640bbec3c6f329c7863040a933d2d358", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-windows-x86_64.exe" + "sha256": "f1c6e953e119e7d1558b76ec6826633963edefcde7f499ca6601ca094f568767", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "1d466f6a509ff4806edfc96e2ce981802a750d1a643e94f64bf9d6fbf4cd92cc", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-windows-aarch64.exe" + "sha256": "92d231bd6a2d515bee17e31e3ee0e3d158a852938f86d59dec0712d382139bde", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.13.0" + "version": "2.14.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From a1332d3535f30e56c5d2e923f97549a20474059e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Dec 2022 16:06:47 -0800 Subject: [PATCH 119/667] Update 22.06-rc to compose 2.14.0 --- 22.06-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 ++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/22.06-rc/cli/Dockerfile b/22.06-rc/cli/Dockerfile index bdded4177..412d87686 100644 --- a/22.06-rc/cli/Dockerfile +++ b/22.06-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.13.0 +ENV DOCKER_COMPOSE_VERSION 2.14.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-x86_64'; \ - sha256='943ff254867e1c23cd6414d7255790daddc7ab69013dd79ba5c172410cbafb14'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-x86_64'; \ + sha256='fdf634ab2b01aca33372bef2bf866699ef2e1f2dab19972e37967b1fc2a11402'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv6'; \ - sha256='c188afabb4565145beaf3ccd025d04428f7ba543616fb7042190d267ffb3df77'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv6'; \ + sha256='63e0826ddebc1ae776f38ab872b41f68b48fca246cdf67c709e07eef543cdf88'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv7'; \ - sha256='7f985bf4b61f70b17a3c7da2d4cedb7e8fb13bc7c67d5e6e2fd23dd28212d61a'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv7'; \ + sha256='c1664c4dcefc2a56a4f16f4dbd76e531f237bfbf713b90d3acea50df42a1aada'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-aarch64'; \ - sha256='4a920b7d5fe5011dd466fa87ea3b47ee5f224b5770337188daee359ec606eb20'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-aarch64'; \ + sha256='0265f45b30f4f0e1d53c1968c590181f64c546129d967460de382c6de38af191'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-ppc64le'; \ - sha256='2aaa046eb055d2b0ccbdeac2c22f2bf927adb4c328b912a458686bf0861322d1'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-ppc64le'; \ + sha256='dbee58426af567787e5c1d14e925cca0d0a958edc55203c4b29c10dda8e27355'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-riscv64'; \ - sha256='f8690e1c715a1bd87316cdd4e1ba1c0144f02eaa9f037075a471d926af133306'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-riscv64'; \ + sha256='d447a75ff4d900b19d40e0c69811b335518f8a5fbc6377e0aff25a3b999a8c49'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-s390x'; \ - sha256='e48830b80893ac41d8f7198f6660f23c24c4a7cde3b95593e534ff7bb3ee0a03'; \ + url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-s390x'; \ + sha256='2c5bbb6513d7377919bd4189f25d8bf5d8706a5345f10609d8c49d5cf4d8ab88'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index aaa49729a..1aac82eb9 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "943ff254867e1c23cd6414d7255790daddc7ab69013dd79ba5c172410cbafb14", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-x86_64" + "sha256": "fdf634ab2b01aca33372bef2bf866699ef2e1f2dab19972e37967b1fc2a11402", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "c188afabb4565145beaf3ccd025d04428f7ba543616fb7042190d267ffb3df77", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv6" + "sha256": "63e0826ddebc1ae776f38ab872b41f68b48fca246cdf67c709e07eef543cdf88", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "7f985bf4b61f70b17a3c7da2d4cedb7e8fb13bc7c67d5e6e2fd23dd28212d61a", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-armv7" + "sha256": "c1664c4dcefc2a56a4f16f4dbd76e531f237bfbf713b90d3acea50df42a1aada", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "4a920b7d5fe5011dd466fa87ea3b47ee5f224b5770337188daee359ec606eb20", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-aarch64" + "sha256": "0265f45b30f4f0e1d53c1968c590181f64c546129d967460de382c6de38af191", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "611df7b061e53c46c8d6d50a19ba096478d79613210f12a0f1186b5d088a2e16", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-darwin-x86_64" + "sha256": "7171ad9b6bd79d7398d863e7227226a408e87cf03bbbd9a004c3a1b8b1643ef7", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "2954e0e42746a46a5a1add39af01b09e4fb607ae140aa4ddb07197023675821b", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-darwin-aarch64" + "sha256": "08766750383f30e80c21826f8f3de6add30625a97e927b6143d615c7da6ce739", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "2aaa046eb055d2b0ccbdeac2c22f2bf927adb4c328b912a458686bf0861322d1", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-ppc64le" + "sha256": "dbee58426af567787e5c1d14e925cca0d0a958edc55203c4b29c10dda8e27355", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "f8690e1c715a1bd87316cdd4e1ba1c0144f02eaa9f037075a471d926af133306", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-riscv64" + "sha256": "d447a75ff4d900b19d40e0c69811b335518f8a5fbc6377e0aff25a3b999a8c49", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "e48830b80893ac41d8f7198f6660f23c24c4a7cde3b95593e534ff7bb3ee0a03", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-linux-s390x" + "sha256": "2c5bbb6513d7377919bd4189f25d8bf5d8706a5345f10609d8c49d5cf4d8ab88", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "09f099b74dcb566a5d77c46d3e8e6061640bbec3c6f329c7863040a933d2d358", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-windows-x86_64.exe" + "sha256": "f1c6e953e119e7d1558b76ec6826633963edefcde7f499ca6601ca094f568767", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "1d466f6a509ff4806edfc96e2ce981802a750d1a643e94f64bf9d6fbf4cd92cc", - "url": "https://github.com/docker/compose/releases/download/v2.13.0/docker-compose-windows-aarch64.exe" + "sha256": "92d231bd6a2d515bee17e31e3ee0e3d158a852938f86d59dec0712d382139bde", + "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.13.0" + "version": "2.14.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From c608944bf9422f7cd70951b9519866495b81e76d Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 6 Dec 2022 09:35:51 -0800 Subject: [PATCH 120/667] Update to 23.0.0-beta.1 --- {22.06-rc => 23.0-rc}/cli/Dockerfile | 10 +++++----- .../cli/docker-entrypoint.sh | 0 {22.06-rc => 23.0-rc}/cli/modprobe.sh | 0 .../dind-rootless/Dockerfile | 6 +++--- {22.06-rc => 23.0-rc}/dind/Dockerfile | 12 +++++------ .../dind/dockerd-entrypoint.sh | 0 {22.06-rc => 23.0-rc}/git/Dockerfile | 2 +- .../windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 20 +++++++++---------- 10 files changed, 29 insertions(+), 29 deletions(-) rename {22.06-rc => 23.0-rc}/cli/Dockerfile (97%) rename {22.06-rc => 23.0-rc}/cli/docker-entrypoint.sh (100%) rename {22.06-rc => 23.0-rc}/cli/modprobe.sh (100%) rename {22.06-rc => 23.0-rc}/dind-rootless/Dockerfile (93%) rename {22.06-rc => 23.0-rc}/dind/Dockerfile (90%) rename {22.06-rc => 23.0-rc}/dind/dockerd-entrypoint.sh (100%) rename {22.06-rc => 23.0-rc}/git/Dockerfile (83%) rename {22.06-rc => 23.0-rc}/windows/windowsservercore-1809/Dockerfile (96%) rename {22.06-rc => 23.0-rc}/windows/windowsservercore-ltsc2022/Dockerfile (96%) diff --git a/22.06-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile similarity index 97% rename from 22.06-rc/cli/Dockerfile rename to 23.0-rc/cli/Dockerfile index 412d87686..df63fa578 100644 --- a/22.06-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -19,23 +19,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 22.06.0-beta.0 +ENV DOCKER_VERSION 23.0.0-beta.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-22.06.0-beta.0.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-beta.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-22.06.0-beta.0.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-beta.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-22.06.0-beta.0.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-beta.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-22.06.0-beta.0.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-beta.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/22.06-rc/cli/docker-entrypoint.sh b/23.0-rc/cli/docker-entrypoint.sh similarity index 100% rename from 22.06-rc/cli/docker-entrypoint.sh rename to 23.0-rc/cli/docker-entrypoint.sh diff --git a/22.06-rc/cli/modprobe.sh b/23.0-rc/cli/modprobe.sh similarity index 100% rename from 22.06-rc/cli/modprobe.sh rename to 23.0-rc/cli/modprobe.sh diff --git a/22.06-rc/dind-rootless/Dockerfile b/23.0-rc/dind-rootless/Dockerfile similarity index 93% rename from 22.06-rc/dind-rootless/Dockerfile rename to 23.0-rc/dind-rootless/Dockerfile index 60f376b43..e1932a5b7 100644 --- a/22.06-rc/dind-rootless/Dockerfile +++ b/23.0-rc/dind-rootless/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:22.06-rc-dind +FROM docker:23.0-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 @@ -24,10 +24,10 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-22.06.0-beta.0.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-beta.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-22.06.0-beta.0.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-beta.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/22.06-rc/dind/Dockerfile b/23.0-rc/dind/Dockerfile similarity index 90% rename from 22.06-rc/dind/Dockerfile rename to 23.0-rc/dind/Dockerfile index d0d34b270..d42fe8cda 100644 --- a/22.06-rc/dind/Dockerfile +++ b/23.0-rc/dind/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:22.06-rc-cli +FROM docker:23.0-rc-cli # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies RUN set -eux; \ @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-22.06.0-beta.0.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-beta.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-22.06.0-beta.0.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-beta.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-22.06.0-beta.0.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-beta.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-22.06.0-beta.0.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-beta.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ @@ -63,7 +63,7 @@ RUN set -eux; \ --strip-components 1 \ --directory /usr/local/bin/ \ --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:22.06-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer +# we exclude the CLI binary because we already extracted that over in the "docker:23.0-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer --exclude 'docker/docker' \ ; \ rm docker.tgz; \ diff --git a/22.06-rc/dind/dockerd-entrypoint.sh b/23.0-rc/dind/dockerd-entrypoint.sh similarity index 100% rename from 22.06-rc/dind/dockerd-entrypoint.sh rename to 23.0-rc/dind/dockerd-entrypoint.sh diff --git a/22.06-rc/git/Dockerfile b/23.0-rc/git/Dockerfile similarity index 83% rename from 22.06-rc/git/Dockerfile rename to 23.0-rc/git/Dockerfile index 632854d75..930f57332 100644 --- a/22.06-rc/git/Dockerfile +++ b/23.0-rc/git/Dockerfile @@ -4,6 +4,6 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:22.06-rc-cli +FROM docker:23.0-rc-cli RUN apk add --no-cache git diff --git a/22.06-rc/windows/windowsservercore-1809/Dockerfile b/23.0-rc/windows/windowsservercore-1809/Dockerfile similarity index 96% rename from 22.06-rc/windows/windowsservercore-1809/Dockerfile rename to 23.0-rc/windows/windowsservercore-1809/Dockerfile index 081670fe0..fadc21c2b 100644 --- a/22.06-rc/windows/windowsservercore-1809/Dockerfile +++ b/23.0-rc/windows/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 22.06.0-beta.0 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-22.06.0-beta.0.zip +ENV DOCKER_VERSION 23.0.0-beta.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-beta.1.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/22.06-rc/windows/windowsservercore-ltsc2022/Dockerfile b/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile similarity index 96% rename from 22.06-rc/windows/windowsservercore-ltsc2022/Dockerfile rename to 23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile index a4fcb6be6..c4a739857 100644 --- a/22.06-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0-rc/windows/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 22.06.0-beta.0 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-22.06.0-beta.0.zip +ENV DOCKER_VERSION 23.0.0-beta.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-beta.1.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/versions.json b/versions.json index 1aac82eb9..7d25f192e 100644 --- a/versions.json +++ b/versions.json @@ -141,25 +141,25 @@ "version": "20.10.21" }, "20.10-rc": null, - "22.06": null, - "22.06-rc": { + "23.0": null, + "23.0-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-22.06.0-beta.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-22.06.0-beta.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-beta.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-beta.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-22.06.0-beta.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-23.0.0-beta.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-22.06.0-beta.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-23.0.0-beta.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-22.06.0-beta.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-22.06.0-beta.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-beta.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-beta.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-22.06.0-beta.0.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-23.0.0-beta.1.zip" } }, "buildx": { @@ -281,6 +281,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "22.06.0-beta.0" + "version": "23.0.0-beta.1" } } From 750eae141f9bf855772ad3841f61f972eb467cec Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 15 Dec 2022 10:04:19 -0800 Subject: [PATCH 121/667] Update 20.10 to compose 2.14.1 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index e6b85d274..23e057ef5 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.14.0 +ENV DOCKER_COMPOSE_VERSION 2.14.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-x86_64'; \ - sha256='fdf634ab2b01aca33372bef2bf866699ef2e1f2dab19972e37967b1fc2a11402'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64'; \ + sha256='e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv6'; \ - sha256='63e0826ddebc1ae776f38ab872b41f68b48fca246cdf67c709e07eef543cdf88'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6'; \ + sha256='7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv7'; \ - sha256='c1664c4dcefc2a56a4f16f4dbd76e531f237bfbf713b90d3acea50df42a1aada'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7'; \ + sha256='4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-aarch64'; \ - sha256='0265f45b30f4f0e1d53c1968c590181f64c546129d967460de382c6de38af191'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64'; \ + sha256='49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-ppc64le'; \ - sha256='dbee58426af567787e5c1d14e925cca0d0a958edc55203c4b29c10dda8e27355'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le'; \ + sha256='6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-riscv64'; \ - sha256='d447a75ff4d900b19d40e0c69811b335518f8a5fbc6377e0aff25a3b999a8c49'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64'; \ + sha256='c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-s390x'; \ - sha256='2c5bbb6513d7377919bd4189f25d8bf5d8706a5345f10609d8c49d5cf4d8ab88'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x'; \ + sha256='44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 7d25f192e..82fd2e43a 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "fdf634ab2b01aca33372bef2bf866699ef2e1f2dab19972e37967b1fc2a11402", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-x86_64" + "sha256": "e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "63e0826ddebc1ae776f38ab872b41f68b48fca246cdf67c709e07eef543cdf88", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv6" + "sha256": "7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "c1664c4dcefc2a56a4f16f4dbd76e531f237bfbf713b90d3acea50df42a1aada", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv7" + "sha256": "4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "0265f45b30f4f0e1d53c1968c590181f64c546129d967460de382c6de38af191", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-aarch64" + "sha256": "49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "7171ad9b6bd79d7398d863e7227226a408e87cf03bbbd9a004c3a1b8b1643ef7", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-darwin-x86_64" + "sha256": "44f9a493d4a8ac3433297bbfd03ef440f69518cc6d3ed24c9544123f043421ca", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "08766750383f30e80c21826f8f3de6add30625a97e927b6143d615c7da6ce739", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-darwin-aarch64" + "sha256": "c564ae03447313264addf697abfc73fd903fd90417438fd97e1eec3acfbfa946", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "dbee58426af567787e5c1d14e925cca0d0a958edc55203c4b29c10dda8e27355", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-ppc64le" + "sha256": "6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "d447a75ff4d900b19d40e0c69811b335518f8a5fbc6377e0aff25a3b999a8c49", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-riscv64" + "sha256": "c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2c5bbb6513d7377919bd4189f25d8bf5d8706a5345f10609d8c49d5cf4d8ab88", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-s390x" + "sha256": "44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "f1c6e953e119e7d1558b76ec6826633963edefcde7f499ca6601ca094f568767", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-windows-x86_64.exe" + "sha256": "82394eecdb3cb9e6973edf8c8cc767123f7d2847572b98dcd42bda0e16e4b7e8", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "92d231bd6a2d515bee17e31e3ee0e3d158a852938f86d59dec0712d382139bde", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-windows-aarch64.exe" + "sha256": "7d4a5649afaabbc70528a112e200c0beb3c4983026efd0f29dd2be8cf2043010", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.14.0" + "version": "2.14.1" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From c70759e9e3b33e11688e161af5547479b40080a2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 15 Dec 2022 10:07:04 -0800 Subject: [PATCH 122/667] Update 23.0-rc to compose 2.14.1 --- 23.0-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile index df63fa578..ce7f616d2 100644 --- a/23.0-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.14.0 +ENV DOCKER_COMPOSE_VERSION 2.14.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-x86_64'; \ - sha256='fdf634ab2b01aca33372bef2bf866699ef2e1f2dab19972e37967b1fc2a11402'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64'; \ + sha256='e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv6'; \ - sha256='63e0826ddebc1ae776f38ab872b41f68b48fca246cdf67c709e07eef543cdf88'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6'; \ + sha256='7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv7'; \ - sha256='c1664c4dcefc2a56a4f16f4dbd76e531f237bfbf713b90d3acea50df42a1aada'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7'; \ + sha256='4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-aarch64'; \ - sha256='0265f45b30f4f0e1d53c1968c590181f64c546129d967460de382c6de38af191'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64'; \ + sha256='49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-ppc64le'; \ - sha256='dbee58426af567787e5c1d14e925cca0d0a958edc55203c4b29c10dda8e27355'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le'; \ + sha256='6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-riscv64'; \ - sha256='d447a75ff4d900b19d40e0c69811b335518f8a5fbc6377e0aff25a3b999a8c49'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64'; \ + sha256='c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-s390x'; \ - sha256='2c5bbb6513d7377919bd4189f25d8bf5d8706a5345f10609d8c49d5cf4d8ab88'; \ + url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x'; \ + sha256='44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 82fd2e43a..0d0906762 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "fdf634ab2b01aca33372bef2bf866699ef2e1f2dab19972e37967b1fc2a11402", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-x86_64" + "sha256": "e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "63e0826ddebc1ae776f38ab872b41f68b48fca246cdf67c709e07eef543cdf88", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv6" + "sha256": "7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "c1664c4dcefc2a56a4f16f4dbd76e531f237bfbf713b90d3acea50df42a1aada", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv7" + "sha256": "4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "0265f45b30f4f0e1d53c1968c590181f64c546129d967460de382c6de38af191", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-aarch64" + "sha256": "49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "7171ad9b6bd79d7398d863e7227226a408e87cf03bbbd9a004c3a1b8b1643ef7", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-darwin-x86_64" + "sha256": "44f9a493d4a8ac3433297bbfd03ef440f69518cc6d3ed24c9544123f043421ca", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "08766750383f30e80c21826f8f3de6add30625a97e927b6143d615c7da6ce739", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-darwin-aarch64" + "sha256": "c564ae03447313264addf697abfc73fd903fd90417438fd97e1eec3acfbfa946", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "dbee58426af567787e5c1d14e925cca0d0a958edc55203c4b29c10dda8e27355", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-ppc64le" + "sha256": "6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "d447a75ff4d900b19d40e0c69811b335518f8a5fbc6377e0aff25a3b999a8c49", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-riscv64" + "sha256": "c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2c5bbb6513d7377919bd4189f25d8bf5d8706a5345f10609d8c49d5cf4d8ab88", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-s390x" + "sha256": "44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "f1c6e953e119e7d1558b76ec6826633963edefcde7f499ca6601ca094f568767", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-windows-x86_64.exe" + "sha256": "82394eecdb3cb9e6973edf8c8cc767123f7d2847572b98dcd42bda0e16e4b7e8", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "92d231bd6a2d515bee17e31e3ee0e3d158a852938f86d59dec0712d382139bde", - "url": "https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-windows-aarch64.exe" + "sha256": "7d4a5649afaabbc70528a112e200c0beb3c4983026efd0f29dd2be8cf2043010", + "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.14.0" + "version": "2.14.1" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 32a92d275e8aa2edd2a99ad55e56a106e48601d6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 16 Dec 2022 04:04:16 -0800 Subject: [PATCH 123/667] Update 20.10 to 20.10.22 --- 20.10/cli/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/dind/Dockerfile | 8 ++++---- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 23e057ef5..8e26f27a2 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -19,23 +19,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 20.10.21 +ENV DOCKER_VERSION 20.10.22 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.21.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.22.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.21.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.22.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.21.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.22.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.21.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.22.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 081215985..f8dfcfa16 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.21.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.22.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.21.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.22.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index 592a4acf5..e4d90cc83 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/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-20.10.21.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.22.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.21.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.22.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.21.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.22.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.21.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.22.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 23ae361d4..2e26f5975 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.21 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.21.zip +ENV DOCKER_VERSION 20.10.22 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.22.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index 13ae524da..fbd12d267 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.21 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.21.zip +ENV DOCKER_VERSION 20.10.22 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.22.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/versions.json b/versions.json index 0d0906762..d95acae24 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "20.10": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.21.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.21.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.22.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.22.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.21.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.22.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.21.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.22.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.21.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.21.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.22.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.22.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.21.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.22.zip" } }, "buildx": { @@ -138,7 +138,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.21" + "version": "20.10.22" }, "20.10-rc": null, "23.0": null, From a7c1c992dcb9ee46f028aec8558188738b5c005c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 20 Dec 2022 04:04:16 -0800 Subject: [PATCH 124/667] Update 20.10 to compose 2.14.2 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 8e26f27a2..1fb03892b 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.14.1 +ENV DOCKER_COMPOSE_VERSION 2.14.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64'; \ - sha256='e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-x86_64'; \ + sha256='d056a8330a01f22c249b9fa03ad0d5be889b79b648cad43c8549eb4c3f8ff0ba'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6'; \ - sha256='7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv6'; \ + sha256='164b04d5970f340eb6cb4da171b2dc0d12c345a6092c8ac2409b5fb4fc8af5e6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7'; \ - sha256='4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv7'; \ + sha256='6e01028d97bc48bfd3894d9161586e74c0f37cf7d67a67ab7eafb351c2003cb3'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64'; \ - sha256='49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-aarch64'; \ + sha256='48ef22ecea70b4b197def1c1bfd2e797f7117db5257f6e505e64f03fdc329a7e'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le'; \ - sha256='6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-ppc64le'; \ + sha256='8cbceb45fc656ec9f9e24b8e61fda54d233ecc8f46cee8ef5ae5acfdcc7940d4'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64'; \ - sha256='c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-riscv64'; \ + sha256='e9d612ff8d198911f93706f4eec2bb58abb24c0f869cff7d69f6a8e24ce05420'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x'; \ - sha256='44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-s390x'; \ + sha256='9fec4a8628729766f4600ec0f8fb5aa760b6a20673e1abfb3d78f3b2eb02696a'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index d95acae24..9a01a28a7 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64" + "sha256": "d056a8330a01f22c249b9fa03ad0d5be889b79b648cad43c8549eb4c3f8ff0ba", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6" + "sha256": "164b04d5970f340eb6cb4da171b2dc0d12c345a6092c8ac2409b5fb4fc8af5e6", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7" + "sha256": "6e01028d97bc48bfd3894d9161586e74c0f37cf7d67a67ab7eafb351c2003cb3", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64" + "sha256": "48ef22ecea70b4b197def1c1bfd2e797f7117db5257f6e505e64f03fdc329a7e", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "44f9a493d4a8ac3433297bbfd03ef440f69518cc6d3ed24c9544123f043421ca", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-darwin-x86_64" + "sha256": "906d059f5fe2b75b5a6c36e7d92aefd09d6d9197e93a2c589503807f354fc60c", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "c564ae03447313264addf697abfc73fd903fd90417438fd97e1eec3acfbfa946", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-darwin-aarch64" + "sha256": "bd8b2ef058512fa6912851c719c0a8e54ba656028ccc7be66c24ceb163be1c3e", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le" + "sha256": "8cbceb45fc656ec9f9e24b8e61fda54d233ecc8f46cee8ef5ae5acfdcc7940d4", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64" + "sha256": "e9d612ff8d198911f93706f4eec2bb58abb24c0f869cff7d69f6a8e24ce05420", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x" + "sha256": "9fec4a8628729766f4600ec0f8fb5aa760b6a20673e1abfb3d78f3b2eb02696a", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "82394eecdb3cb9e6973edf8c8cc767123f7d2847572b98dcd42bda0e16e4b7e8", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-windows-x86_64.exe" + "sha256": "df60d91afd4cc81a3dfd742b50ad6717803e7542db9ede460fc140cea7dd2b59", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "7d4a5649afaabbc70528a112e200c0beb3c4983026efd0f29dd2be8cf2043010", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-windows-aarch64.exe" + "sha256": "d8c44bd66300be151c2ac8e25f8ec06f106ef7fc154909e727261e1305c1044c", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.14.1" + "version": "2.14.2" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 7dc92d7c5555cedf97411b179c617ef2781a06bd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 20 Dec 2022 04:06:37 -0800 Subject: [PATCH 125/667] Update 23.0-rc to compose 2.14.2 --- 23.0-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile index ce7f616d2..589f8e451 100644 --- a/23.0-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.14.1 +ENV DOCKER_COMPOSE_VERSION 2.14.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64'; \ - sha256='e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-x86_64'; \ + sha256='d056a8330a01f22c249b9fa03ad0d5be889b79b648cad43c8549eb4c3f8ff0ba'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6'; \ - sha256='7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv6'; \ + sha256='164b04d5970f340eb6cb4da171b2dc0d12c345a6092c8ac2409b5fb4fc8af5e6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7'; \ - sha256='4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv7'; \ + sha256='6e01028d97bc48bfd3894d9161586e74c0f37cf7d67a67ab7eafb351c2003cb3'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64'; \ - sha256='49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-aarch64'; \ + sha256='48ef22ecea70b4b197def1c1bfd2e797f7117db5257f6e505e64f03fdc329a7e'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le'; \ - sha256='6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-ppc64le'; \ + sha256='8cbceb45fc656ec9f9e24b8e61fda54d233ecc8f46cee8ef5ae5acfdcc7940d4'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64'; \ - sha256='c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-riscv64'; \ + sha256='e9d612ff8d198911f93706f4eec2bb58abb24c0f869cff7d69f6a8e24ce05420'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x'; \ - sha256='44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b'; \ + url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-s390x'; \ + sha256='9fec4a8628729766f4600ec0f8fb5aa760b6a20673e1abfb3d78f3b2eb02696a'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 9a01a28a7..58c0bb744 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64" + "sha256": "d056a8330a01f22c249b9fa03ad0d5be889b79b648cad43c8549eb4c3f8ff0ba", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6" + "sha256": "164b04d5970f340eb6cb4da171b2dc0d12c345a6092c8ac2409b5fb4fc8af5e6", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7" + "sha256": "6e01028d97bc48bfd3894d9161586e74c0f37cf7d67a67ab7eafb351c2003cb3", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64" + "sha256": "48ef22ecea70b4b197def1c1bfd2e797f7117db5257f6e505e64f03fdc329a7e", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "44f9a493d4a8ac3433297bbfd03ef440f69518cc6d3ed24c9544123f043421ca", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-darwin-x86_64" + "sha256": "906d059f5fe2b75b5a6c36e7d92aefd09d6d9197e93a2c589503807f354fc60c", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "c564ae03447313264addf697abfc73fd903fd90417438fd97e1eec3acfbfa946", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-darwin-aarch64" + "sha256": "bd8b2ef058512fa6912851c719c0a8e54ba656028ccc7be66c24ceb163be1c3e", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le" + "sha256": "8cbceb45fc656ec9f9e24b8e61fda54d233ecc8f46cee8ef5ae5acfdcc7940d4", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64" + "sha256": "e9d612ff8d198911f93706f4eec2bb58abb24c0f869cff7d69f6a8e24ce05420", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x" + "sha256": "9fec4a8628729766f4600ec0f8fb5aa760b6a20673e1abfb3d78f3b2eb02696a", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "82394eecdb3cb9e6973edf8c8cc767123f7d2847572b98dcd42bda0e16e4b7e8", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-windows-x86_64.exe" + "sha256": "df60d91afd4cc81a3dfd742b50ad6717803e7542db9ede460fc140cea7dd2b59", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "7d4a5649afaabbc70528a112e200c0beb3c4983026efd0f29dd2be8cf2043010", - "url": "https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-windows-aarch64.exe" + "sha256": "d8c44bd66300be151c2ac8e25f8ec06f106ef7fc154909e727261e1305c1044c", + "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.14.1" + "version": "2.14.2" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 811de885dfc8783ae3b7182f1fe8e2d3baba909c Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 20 Dec 2022 14:16:36 -0800 Subject: [PATCH 126/667] Update generated README --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 620a70c0c..a2b8121af 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,11 @@ For outstanding `docker` image PRs, check [PRs with the "library/docker" label o --- -- [![build status badge](https://img.shields.io/github/workflow/status/docker-library/docker/GitHub%20CI/master?label=GitHub%20CI)](https://github.com/docker-library/docker/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amaster) +- [![build status badge](https://img.shields.io/github/actions/workflow/status/docker-library/docker/ci.yml?branch=master&label=GitHub%20CI)](https://github.com/docker-library/docker/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amaster) - [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/docker.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/docker/) | Build | Status | Badges | (per-arch) | |:-:|:-:|:-:|:-:| -| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker/) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/docker/) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/docker/) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker/) | -| [![windows-amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/docker.svg?label=windows-amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/docker/) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/docker.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/docker/) | +| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker/) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker/) | [![windows-amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/docker.svg?label=windows-amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/docker/) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/docker.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/docker/) | From 023a45d6e2a9009fdf01da87499c6f9ca6e27bef Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 27 Dec 2022 10:04:33 -0800 Subject: [PATCH 127/667] Update 23.0-rc to 23.0.0-rc.1 --- 23.0-rc/cli/Dockerfile | 10 +++++----- 23.0-rc/dind-rootless/Dockerfile | 4 ++-- 23.0-rc/dind/Dockerfile | 8 ++++---- .../windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile index 589f8e451..9efbde843 100644 --- a/23.0-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -19,23 +19,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.0-beta.1 +ENV DOCKER_VERSION 23.0.0-rc.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0-rc/dind-rootless/Dockerfile b/23.0-rc/dind-rootless/Dockerfile index e1932a5b7..9e77a9a93 100644 --- a/23.0-rc/dind-rootless/Dockerfile +++ b/23.0-rc/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/test/x86_64/docker-rootless-extras-23.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0-rc/dind/Dockerfile b/23.0-rc/dind/Dockerfile index d42fe8cda..cdb869484 100644 --- a/23.0-rc/dind/Dockerfile +++ b/23.0-rc/dind/Dockerfile @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0-rc/windows/windowsservercore-1809/Dockerfile b/23.0-rc/windows/windowsservercore-1809/Dockerfile index fadc21c2b..9b09dee4f 100644 --- a/23.0-rc/windows/windowsservercore-1809/Dockerfile +++ b/23.0-rc/windows/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.0-beta.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-beta.1.zip +ENV DOCKER_VERSION 23.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.1.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/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile b/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile index c4a739857..e8083aaea 100644 --- a/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0-rc/windows/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.0-beta.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-beta.1.zip +ENV DOCKER_VERSION 23.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.1.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/versions.json b/versions.json index 58c0bb744..e004d91aa 100644 --- a/versions.json +++ b/versions.json @@ -145,21 +145,21 @@ "23.0-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-beta.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-23.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-23.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-beta.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-23.0.0-beta.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.1.zip" } }, "buildx": { @@ -281,6 +281,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "23.0.0-beta.1" + "version": "23.0.0-rc.1" } } From d227bf404d3baf8bd18d189b9f2a4fb4fc16da2d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 5 Jan 2023 04:04:29 -0800 Subject: [PATCH 128/667] Update 23.0-rc to compose 2.15.0 --- 23.0-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile index 9efbde843..bbdb30ac9 100644 --- a/23.0-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.14.2 +ENV DOCKER_COMPOSE_VERSION 2.15.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-x86_64'; \ - sha256='d056a8330a01f22c249b9fa03ad0d5be889b79b648cad43c8549eb4c3f8ff0ba'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64'; \ + sha256='ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv6'; \ - sha256='164b04d5970f340eb6cb4da171b2dc0d12c345a6092c8ac2409b5fb4fc8af5e6'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6'; \ + sha256='0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv7'; \ - sha256='6e01028d97bc48bfd3894d9161586e74c0f37cf7d67a67ab7eafb351c2003cb3'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7'; \ + sha256='343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-aarch64'; \ - sha256='48ef22ecea70b4b197def1c1bfd2e797f7117db5257f6e505e64f03fdc329a7e'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64'; \ + sha256='634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-ppc64le'; \ - sha256='8cbceb45fc656ec9f9e24b8e61fda54d233ecc8f46cee8ef5ae5acfdcc7940d4'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le'; \ + sha256='236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-riscv64'; \ - sha256='e9d612ff8d198911f93706f4eec2bb58abb24c0f869cff7d69f6a8e24ce05420'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64'; \ + sha256='365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-s390x'; \ - sha256='9fec4a8628729766f4600ec0f8fb5aa760b6a20673e1abfb3d78f3b2eb02696a'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x'; \ + sha256='8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index e004d91aa..7a1ca382c 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "d056a8330a01f22c249b9fa03ad0d5be889b79b648cad43c8549eb4c3f8ff0ba", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-x86_64" + "sha256": "ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "164b04d5970f340eb6cb4da171b2dc0d12c345a6092c8ac2409b5fb4fc8af5e6", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv6" + "sha256": "0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "6e01028d97bc48bfd3894d9161586e74c0f37cf7d67a67ab7eafb351c2003cb3", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv7" + "sha256": "343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "48ef22ecea70b4b197def1c1bfd2e797f7117db5257f6e505e64f03fdc329a7e", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-aarch64" + "sha256": "634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "906d059f5fe2b75b5a6c36e7d92aefd09d6d9197e93a2c589503807f354fc60c", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-darwin-x86_64" + "sha256": "c3d5ca2385456796105501e32e75593bfc1c17f234ae38de7ed92d41b21c3135", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "bd8b2ef058512fa6912851c719c0a8e54ba656028ccc7be66c24ceb163be1c3e", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-darwin-aarch64" + "sha256": "9e0d177912d4bfa4eeb139b3d24d4a4312e1cf6018c8d97ec2066f6a4c254e1a", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "8cbceb45fc656ec9f9e24b8e61fda54d233ecc8f46cee8ef5ae5acfdcc7940d4", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-ppc64le" + "sha256": "236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e9d612ff8d198911f93706f4eec2bb58abb24c0f869cff7d69f6a8e24ce05420", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-riscv64" + "sha256": "365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "9fec4a8628729766f4600ec0f8fb5aa760b6a20673e1abfb3d78f3b2eb02696a", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-s390x" + "sha256": "8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "df60d91afd4cc81a3dfd742b50ad6717803e7542db9ede460fc140cea7dd2b59", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-windows-x86_64.exe" + "sha256": "cf909a218e82e0bb48a72d1dc6c0bff7564d71c9b61aeb103305bd72c7822c04", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "d8c44bd66300be151c2ac8e25f8ec06f106ef7fc154909e727261e1305c1044c", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-windows-aarch64.exe" + "sha256": "52b9be45cac1c6b898cf5d845fe04be380529d25dbe470f4c956d14cb7184072", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.14.2" + "version": "2.15.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 59157a21543ec40e2553397521cccf3c3ca4570d Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 5 Jan 2023 09:00:20 -0800 Subject: [PATCH 129/667] Update "dindLatest" calculation to be more defensive --- versions.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/versions.sh b/versions.sh index 16626d3e5..3b4f4c9fb 100755 --- a/versions.sh +++ b/versions.sh @@ -24,7 +24,8 @@ fi versions=( "${versions[@]%/}" ) # "tac|tac" for http://stackoverflow.com/a/28879552/433558 -dindLatest="$(curl -fsSL 'https://github.com/docker/docker/commits/master/hack/dind.atom' | tac|tac | awk -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')" +dindLatest="$(curl -fsSL 'https://github.com/docker/docker/commits/master/hack/dind.atom' | grep -E 'id.*Commit')" +dindLatest="$(awk <<<"$dindLatest" -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')" dockerVersions="$( git ls-remote --tags https://github.com/docker/docker.git \ From 297d86c9908562ad5564e44599a126d5509bdcf4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 5 Jan 2023 09:01:37 -0800 Subject: [PATCH 130/667] Update 20.10 to compose 2.15.0 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 1fb03892b..ac3b9b2ac 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.14.2 +ENV DOCKER_COMPOSE_VERSION 2.15.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-x86_64'; \ - sha256='d056a8330a01f22c249b9fa03ad0d5be889b79b648cad43c8549eb4c3f8ff0ba'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64'; \ + sha256='ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv6'; \ - sha256='164b04d5970f340eb6cb4da171b2dc0d12c345a6092c8ac2409b5fb4fc8af5e6'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6'; \ + sha256='0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv7'; \ - sha256='6e01028d97bc48bfd3894d9161586e74c0f37cf7d67a67ab7eafb351c2003cb3'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7'; \ + sha256='343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-aarch64'; \ - sha256='48ef22ecea70b4b197def1c1bfd2e797f7117db5257f6e505e64f03fdc329a7e'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64'; \ + sha256='634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-ppc64le'; \ - sha256='8cbceb45fc656ec9f9e24b8e61fda54d233ecc8f46cee8ef5ae5acfdcc7940d4'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le'; \ + sha256='236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-riscv64'; \ - sha256='e9d612ff8d198911f93706f4eec2bb58abb24c0f869cff7d69f6a8e24ce05420'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64'; \ + sha256='365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-s390x'; \ - sha256='9fec4a8628729766f4600ec0f8fb5aa760b6a20673e1abfb3d78f3b2eb02696a'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x'; \ + sha256='8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 7a1ca382c..50c76bef0 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "d056a8330a01f22c249b9fa03ad0d5be889b79b648cad43c8549eb4c3f8ff0ba", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-x86_64" + "sha256": "ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "164b04d5970f340eb6cb4da171b2dc0d12c345a6092c8ac2409b5fb4fc8af5e6", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv6" + "sha256": "0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "6e01028d97bc48bfd3894d9161586e74c0f37cf7d67a67ab7eafb351c2003cb3", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv7" + "sha256": "343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "48ef22ecea70b4b197def1c1bfd2e797f7117db5257f6e505e64f03fdc329a7e", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-aarch64" + "sha256": "634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "906d059f5fe2b75b5a6c36e7d92aefd09d6d9197e93a2c589503807f354fc60c", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-darwin-x86_64" + "sha256": "c3d5ca2385456796105501e32e75593bfc1c17f234ae38de7ed92d41b21c3135", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "bd8b2ef058512fa6912851c719c0a8e54ba656028ccc7be66c24ceb163be1c3e", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-darwin-aarch64" + "sha256": "9e0d177912d4bfa4eeb139b3d24d4a4312e1cf6018c8d97ec2066f6a4c254e1a", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "8cbceb45fc656ec9f9e24b8e61fda54d233ecc8f46cee8ef5ae5acfdcc7940d4", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-ppc64le" + "sha256": "236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e9d612ff8d198911f93706f4eec2bb58abb24c0f869cff7d69f6a8e24ce05420", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-riscv64" + "sha256": "365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "9fec4a8628729766f4600ec0f8fb5aa760b6a20673e1abfb3d78f3b2eb02696a", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-s390x" + "sha256": "8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "df60d91afd4cc81a3dfd742b50ad6717803e7542db9ede460fc140cea7dd2b59", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-windows-x86_64.exe" + "sha256": "cf909a218e82e0bb48a72d1dc6c0bff7564d71c9b61aeb103305bd72c7822c04", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "d8c44bd66300be151c2ac8e25f8ec06f106ef7fc154909e727261e1305c1044c", - "url": "https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-windows-aarch64.exe" + "sha256": "52b9be45cac1c6b898cf5d845fe04be380529d25dbe470f4c956d14cb7184072", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.14.2" + "version": "2.15.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From ff02dc08c394ba53597c7253a26c537f4be19591 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 5 Jan 2023 09:41:19 -0800 Subject: [PATCH 131/667] Remove outdated comment --- versions.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/versions.sh b/versions.sh index 3b4f4c9fb..918f98fc0 100755 --- a/versions.sh +++ b/versions.sh @@ -23,7 +23,6 @@ else fi versions=( "${versions[@]%/}" ) -# "tac|tac" for http://stackoverflow.com/a/28879552/433558 dindLatest="$(curl -fsSL 'https://github.com/docker/docker/commits/master/hack/dind.atom' | grep -E 'id.*Commit')" dindLatest="$(awk <<<"$dindLatest" -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')" From 95414fb25c65f77412e44dac9949c12e73dc58dc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 9 Jan 2023 10:04:14 -0800 Subject: [PATCH 132/667] Update 20.10 to compose 2.15.1 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index ac3b9b2ac..407df3e70 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.15.0 +ENV DOCKER_COMPOSE_VERSION 2.15.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64'; \ - sha256='ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64'; \ + sha256='bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6'; \ - sha256='0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6'; \ + sha256='a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7'; \ - sha256='343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7'; \ + sha256='e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64'; \ - sha256='634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64'; \ + sha256='14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le'; \ - sha256='236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le'; \ + sha256='bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64'; \ - sha256='365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64'; \ + sha256='9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x'; \ - sha256='8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x'; \ + sha256='cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 50c76bef0..e69400990 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64" + "sha256": "bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6" + "sha256": "a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7" + "sha256": "e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64" + "sha256": "14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c3d5ca2385456796105501e32e75593bfc1c17f234ae38de7ed92d41b21c3135", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-x86_64" + "sha256": "c7557765509407bc4f7325f4220a9317ecbb96c9eebfbd0ab37a27ab5002b1d5", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "9e0d177912d4bfa4eeb139b3d24d4a4312e1cf6018c8d97ec2066f6a4c254e1a", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-aarch64" + "sha256": "b327335bee9df885f245d4eb77dd89acbde865d3ecbab8267a1319385f5f063a", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le" + "sha256": "bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64" + "sha256": "9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x" + "sha256": "cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "cf909a218e82e0bb48a72d1dc6c0bff7564d71c9b61aeb103305bd72c7822c04", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-x86_64.exe" + "sha256": "538598025dc9ae41298abf859d5b312fba40359c691d9b14527375f4633cbe65", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "52b9be45cac1c6b898cf5d845fe04be380529d25dbe470f4c956d14cb7184072", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-aarch64.exe" + "sha256": "76ad1680eb8c8bb1236243f56fc8c693e377408603bbbc5511d2d491aea2971b", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.15.0" + "version": "2.15.1" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 0997ca7ad1d7892324d84951d55192d5ef629bcc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 9 Jan 2023 10:06:38 -0800 Subject: [PATCH 133/667] Update 23.0-rc to compose 2.15.1 --- 23.0-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile index bbdb30ac9..67d2cc84c 100644 --- a/23.0-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.15.0 +ENV DOCKER_COMPOSE_VERSION 2.15.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64'; \ - sha256='ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64'; \ + sha256='bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6'; \ - sha256='0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6'; \ + sha256='a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7'; \ - sha256='343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7'; \ + sha256='e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64'; \ - sha256='634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64'; \ + sha256='14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le'; \ - sha256='236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le'; \ + sha256='bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64'; \ - sha256='365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64'; \ + sha256='9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x'; \ - sha256='8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x'; \ + sha256='cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index e69400990..5cf6b55b7 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64" + "sha256": "bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6" + "sha256": "a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7" + "sha256": "e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64" + "sha256": "14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c3d5ca2385456796105501e32e75593bfc1c17f234ae38de7ed92d41b21c3135", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-x86_64" + "sha256": "c7557765509407bc4f7325f4220a9317ecbb96c9eebfbd0ab37a27ab5002b1d5", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "9e0d177912d4bfa4eeb139b3d24d4a4312e1cf6018c8d97ec2066f6a4c254e1a", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-aarch64" + "sha256": "b327335bee9df885f245d4eb77dd89acbde865d3ecbab8267a1319385f5f063a", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le" + "sha256": "bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64" + "sha256": "9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x" + "sha256": "cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "cf909a218e82e0bb48a72d1dc6c0bff7564d71c9b61aeb103305bd72c7822c04", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-x86_64.exe" + "sha256": "538598025dc9ae41298abf859d5b312fba40359c691d9b14527375f4633cbe65", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "52b9be45cac1c6b898cf5d845fe04be380529d25dbe470f4c956d14cb7184072", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-aarch64.exe" + "sha256": "76ad1680eb8c8bb1236243f56fc8c693e377408603bbbc5511d2d491aea2971b", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.15.0" + "version": "2.15.1" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 4d1d884a47c011987bc530e4a9418c8d710aa0ae Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 19 Jan 2023 14:56:05 -0800 Subject: [PATCH 134/667] Fix checksum parsing/scraping bug in buildx Refs #391 --- versions.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/versions.sh b/versions.sh index 918f98fc0..0aea8c536 100755 --- a/versions.sh +++ b/versions.sh @@ -83,10 +83,11 @@ for buildxVersion in $buildxVersions; do file: .[1], url: ("https://github.com/docker/buildx/releases/download/v" + $version + "/" + .[1]), } + | select(.file | test("[.]json$") | not) | { ( .file - | capture("[.](?linux|windows|darwin)-(?[^.]+)([.]|$)") - // error("failed to parse os-arch from filename: " + .[1]) + | capture("[.](?linux|windows|darwin)-(?[^.]+)(?[.]exe)?$") + // error("failed to parse os-arch from filename: " + .) | if .os == "linux" then "" else .os + "-" end + ({ "amd64": "amd64", From 5ecac9af14c03e24685e478f1c8ddd7f156883d4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 19 Jan 2023 15:07:40 -0800 Subject: [PATCH 135/667] Update 23.0-rc to 23.0.0-rc.2, buildx 0.10.0, compose 2.15.0 --- 23.0-rc/cli/Dockerfile | 70 +++++------ 23.0-rc/dind-rootless/Dockerfile | 4 +- 23.0-rc/dind/Dockerfile | 8 +- .../windows/windowsservercore-1809/Dockerfile | 4 +- .../windowsservercore-ltsc2022/Dockerfile | 4 +- versions.json | 118 +++++++++--------- 6 files changed, 104 insertions(+), 104 deletions(-) diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile index 67d2cc84c..5c84a07a8 100644 --- a/23.0-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -19,23 +19,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.0-rc.1 +ENV DOCKER_VERSION 23.0.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.9.1 +ENV DOCKER_BUILDX_VERSION 0.10.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-amd64'; \ - sha256='a7fb95177792ca8ffc7243fad7bf2f33738b8b999a184b6201f002a63c43d136'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64'; \ + sha256='f76047e43cd2526a870b9cf385effc7c9642c1a17d144559c43545525415867d'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v6'; \ - sha256='159925b4e679eb66e7f0312c7d57a97e68a418c1fa602a00dd8b29b6406768f0'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6'; \ + sha256='dc037b64e14388cbf5441d3b23a3f1ccd9a56a47007555ce681d89b70d411d31'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v7'; \ - sha256='ba8e5359ce9ba24fec6da07f73591c1b20ac0797a2248b0ef8088f57ae3340fc'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7'; \ + sha256='19b82ba259d83cc75b12bddb1cdc0712dd276f8763d0a65ded2048193973260b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm64'; \ - sha256='bbf6a76bf9aef9c5759ff225b97ce23a24fc11e4fa3cdcae36e5dcf1de2cffc5'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64'; \ + sha256='abf375431775d46139312591aa9471cdf6909d8a4e8392b73940ca136c34eb4d'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-ppc64le'; \ - sha256='1b2441886e556c720c1bf12f18f240113cc45f9eb404c0f162166ca1c96c1b60'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le'; \ + sha256='9850f6ad445d1014a156c33ac7f9074fffd3358db304ef5b4e4509355a4d9fb9'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-riscv64'; \ - sha256='c32372dad653fc70eb756b2cffd026e74425e807c01accaeed4559da881ff57c'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64'; \ + sha256='07529564e5b2f1f6e33fbf947700f9118a727dde2d8486c3e2115bc4fb42d86a'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-s390x'; \ - sha256='90b0ecf315d741888920dddeac9fe2e141123c4fe79465b7b10fe23521c9c366'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x'; \ + sha256='871b4a746765334a1a0b56700525d5ef7f83adcafbb193734e238c8ac102eccc'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.15.1 +ENV DOCKER_COMPOSE_VERSION 2.15.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64'; \ - sha256='bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64'; \ + sha256='ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6'; \ - sha256='a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6'; \ + sha256='0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7'; \ - sha256='e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7'; \ + sha256='343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64'; \ - sha256='14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64'; \ + sha256='634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le'; \ - sha256='bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le'; \ + sha256='236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64'; \ - sha256='9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64'; \ + sha256='365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x'; \ - sha256='cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289'; \ + url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x'; \ + sha256='8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23.0-rc/dind-rootless/Dockerfile b/23.0-rc/dind-rootless/Dockerfile index 9e77a9a93..4154277fd 100644 --- a/23.0-rc/dind-rootless/Dockerfile +++ b/23.0-rc/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/test/x86_64/docker-rootless-extras-23.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0-rc/dind/Dockerfile b/23.0-rc/dind/Dockerfile index cdb869484..8e06c894c 100644 --- a/23.0-rc/dind/Dockerfile +++ b/23.0-rc/dind/Dockerfile @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0-rc/windows/windowsservercore-1809/Dockerfile b/23.0-rc/windows/windowsservercore-1809/Dockerfile index 9b09dee4f..de84c0af5 100644 --- a/23.0-rc/windows/windowsservercore-1809/Dockerfile +++ b/23.0-rc/windows/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.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.1.zip +ENV DOCKER_VERSION 23.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.2.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/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile b/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile index e8083aaea..73a1180ef 100644 --- a/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0-rc/windows/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.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.1.zip +ENV DOCKER_VERSION 23.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.2.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/versions.json b/versions.json index 5cf6b55b7..f8054f9a6 100644 --- a/versions.json +++ b/versions.json @@ -145,132 +145,132 @@ "23.0-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.2.zip" } }, "buildx": { "arches": { "amd64": { - "file": "buildx-v0.9.1.linux-amd64", - "sha256": "a7fb95177792ca8ffc7243fad7bf2f33738b8b999a184b6201f002a63c43d136", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-amd64" + "file": "buildx-v0.10.0.linux-amd64", + "sha256": "f76047e43cd2526a870b9cf385effc7c9642c1a17d144559c43545525415867d", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.9.1.linux-arm-v6", - "sha256": "159925b4e679eb66e7f0312c7d57a97e68a418c1fa602a00dd8b29b6406768f0", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v6" + "file": "buildx-v0.10.0.linux-arm-v6", + "sha256": "dc037b64e14388cbf5441d3b23a3f1ccd9a56a47007555ce681d89b70d411d31", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.9.1.linux-arm-v7", - "sha256": "ba8e5359ce9ba24fec6da07f73591c1b20ac0797a2248b0ef8088f57ae3340fc", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v7" + "file": "buildx-v0.10.0.linux-arm-v7", + "sha256": "19b82ba259d83cc75b12bddb1cdc0712dd276f8763d0a65ded2048193973260b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.9.1.linux-arm64", - "sha256": "bbf6a76bf9aef9c5759ff225b97ce23a24fc11e4fa3cdcae36e5dcf1de2cffc5", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm64" + "file": "buildx-v0.10.0.linux-arm64", + "sha256": "abf375431775d46139312591aa9471cdf6909d8a4e8392b73940ca136c34eb4d", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.9.1.linux-ppc64le", - "sha256": "1b2441886e556c720c1bf12f18f240113cc45f9eb404c0f162166ca1c96c1b60", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-ppc64le" + "file": "buildx-v0.10.0.linux-ppc64le", + "sha256": "9850f6ad445d1014a156c33ac7f9074fffd3358db304ef5b4e4509355a4d9fb9", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.9.1.linux-riscv64", - "sha256": "c32372dad653fc70eb756b2cffd026e74425e807c01accaeed4559da881ff57c", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-riscv64" + "file": "buildx-v0.10.0.linux-riscv64", + "sha256": "07529564e5b2f1f6e33fbf947700f9118a727dde2d8486c3e2115bc4fb42d86a", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.9.1.linux-s390x", - "sha256": "90b0ecf315d741888920dddeac9fe2e141123c4fe79465b7b10fe23521c9c366", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-s390x" + "file": "buildx-v0.10.0.linux-s390x", + "sha256": "871b4a746765334a1a0b56700525d5ef7f83adcafbb193734e238c8ac102eccc", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.9.1.windows-amd64.exe", - "sha256": "a5c53f2e710989c2f6301f6bf8b505e7f581d3d4b9adcb5a1d3f9a36a51d3e46", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-amd64.exe" + "file": "buildx-v0.10.0.windows-amd64.exe", + "sha256": "9b2832b8e97fcf8a67fa94dd2cc293c60aaf7eabab9c2c40fdeb303458a3207f", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.9.1.windows-arm64.exe", - "sha256": "96cb96519f6b008cc68a50884d43869bfc76611f5f13f32bf843a26fb898941c", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-arm64.exe" + "file": "buildx-v0.10.0.windows-arm64.exe", + "sha256": "cce25fae4c2f785abcc8ddb8e7136c0baca998013ceb1981f55d61a4f2d0c9df", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-arm64.exe" } }, - "version": "0.9.1" + "version": "0.10.0" }, "compose": { "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64" + "sha256": "ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6" + "sha256": "0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7" + "sha256": "343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64" + "sha256": "634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c7557765509407bc4f7325f4220a9317ecbb96c9eebfbd0ab37a27ab5002b1d5", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-x86_64" + "sha256": "c3d5ca2385456796105501e32e75593bfc1c17f234ae38de7ed92d41b21c3135", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "b327335bee9df885f245d4eb77dd89acbde865d3ecbab8267a1319385f5f063a", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-aarch64" + "sha256": "9e0d177912d4bfa4eeb139b3d24d4a4312e1cf6018c8d97ec2066f6a4c254e1a", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le" + "sha256": "236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64" + "sha256": "365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x" + "sha256": "8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "538598025dc9ae41298abf859d5b312fba40359c691d9b14527375f4633cbe65", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-x86_64.exe" + "sha256": "cf909a218e82e0bb48a72d1dc6c0bff7564d71c9b61aeb103305bd72c7822c04", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "76ad1680eb8c8bb1236243f56fc8c693e377408603bbbc5511d2d491aea2971b", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-aarch64.exe" + "sha256": "52b9be45cac1c6b898cf5d845fe04be380529d25dbe470f4c956d14cb7184072", + "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.15.1" + "version": "2.15.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ @@ -281,6 +281,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "23.0.0-rc.1" + "version": "23.0.0-rc.2" } } From 03089085068a23c0c5c423331093640dfeecac63 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 19 Jan 2023 15:10:06 -0800 Subject: [PATCH 136/667] Update 20.10 to buildx 0.10.0 --- 20.10/cli/Dockerfile | 30 ++++++++++++------------ versions.json | 56 ++++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 407df3e70..9f7b27f43 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.9.1 +ENV DOCKER_BUILDX_VERSION 0.10.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-amd64'; \ - sha256='a7fb95177792ca8ffc7243fad7bf2f33738b8b999a184b6201f002a63c43d136'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64'; \ + sha256='f76047e43cd2526a870b9cf385effc7c9642c1a17d144559c43545525415867d'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v6'; \ - sha256='159925b4e679eb66e7f0312c7d57a97e68a418c1fa602a00dd8b29b6406768f0'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6'; \ + sha256='dc037b64e14388cbf5441d3b23a3f1ccd9a56a47007555ce681d89b70d411d31'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v7'; \ - sha256='ba8e5359ce9ba24fec6da07f73591c1b20ac0797a2248b0ef8088f57ae3340fc'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7'; \ + sha256='19b82ba259d83cc75b12bddb1cdc0712dd276f8763d0a65ded2048193973260b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm64'; \ - sha256='bbf6a76bf9aef9c5759ff225b97ce23a24fc11e4fa3cdcae36e5dcf1de2cffc5'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64'; \ + sha256='abf375431775d46139312591aa9471cdf6909d8a4e8392b73940ca136c34eb4d'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-ppc64le'; \ - sha256='1b2441886e556c720c1bf12f18f240113cc45f9eb404c0f162166ca1c96c1b60'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le'; \ + sha256='9850f6ad445d1014a156c33ac7f9074fffd3358db304ef5b4e4509355a4d9fb9'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-riscv64'; \ - sha256='c32372dad653fc70eb756b2cffd026e74425e807c01accaeed4559da881ff57c'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64'; \ + sha256='07529564e5b2f1f6e33fbf947700f9118a727dde2d8486c3e2115bc4fb42d86a'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-s390x'; \ - sha256='90b0ecf315d741888920dddeac9fe2e141123c4fe79465b7b10fe23521c9c366'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x'; \ + sha256='871b4a746765334a1a0b56700525d5ef7f83adcafbb193734e238c8ac102eccc'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index f8054f9a6..3c1188653 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.9.1.linux-amd64", - "sha256": "a7fb95177792ca8ffc7243fad7bf2f33738b8b999a184b6201f002a63c43d136", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-amd64" + "file": "buildx-v0.10.0.linux-amd64", + "sha256": "f76047e43cd2526a870b9cf385effc7c9642c1a17d144559c43545525415867d", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.9.1.linux-arm-v6", - "sha256": "159925b4e679eb66e7f0312c7d57a97e68a418c1fa602a00dd8b29b6406768f0", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v6" + "file": "buildx-v0.10.0.linux-arm-v6", + "sha256": "dc037b64e14388cbf5441d3b23a3f1ccd9a56a47007555ce681d89b70d411d31", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.9.1.linux-arm-v7", - "sha256": "ba8e5359ce9ba24fec6da07f73591c1b20ac0797a2248b0ef8088f57ae3340fc", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm-v7" + "file": "buildx-v0.10.0.linux-arm-v7", + "sha256": "19b82ba259d83cc75b12bddb1cdc0712dd276f8763d0a65ded2048193973260b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.9.1.linux-arm64", - "sha256": "bbf6a76bf9aef9c5759ff225b97ce23a24fc11e4fa3cdcae36e5dcf1de2cffc5", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-arm64" + "file": "buildx-v0.10.0.linux-arm64", + "sha256": "abf375431775d46139312591aa9471cdf6909d8a4e8392b73940ca136c34eb4d", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.9.1.linux-ppc64le", - "sha256": "1b2441886e556c720c1bf12f18f240113cc45f9eb404c0f162166ca1c96c1b60", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-ppc64le" + "file": "buildx-v0.10.0.linux-ppc64le", + "sha256": "9850f6ad445d1014a156c33ac7f9074fffd3358db304ef5b4e4509355a4d9fb9", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.9.1.linux-riscv64", - "sha256": "c32372dad653fc70eb756b2cffd026e74425e807c01accaeed4559da881ff57c", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-riscv64" + "file": "buildx-v0.10.0.linux-riscv64", + "sha256": "07529564e5b2f1f6e33fbf947700f9118a727dde2d8486c3e2115bc4fb42d86a", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.9.1.linux-s390x", - "sha256": "90b0ecf315d741888920dddeac9fe2e141123c4fe79465b7b10fe23521c9c366", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.linux-s390x" + "file": "buildx-v0.10.0.linux-s390x", + "sha256": "871b4a746765334a1a0b56700525d5ef7f83adcafbb193734e238c8ac102eccc", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.9.1.windows-amd64.exe", - "sha256": "a5c53f2e710989c2f6301f6bf8b505e7f581d3d4b9adcb5a1d3f9a36a51d3e46", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-amd64.exe" + "file": "buildx-v0.10.0.windows-amd64.exe", + "sha256": "9b2832b8e97fcf8a67fa94dd2cc293c60aaf7eabab9c2c40fdeb303458a3207f", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.9.1.windows-arm64.exe", - "sha256": "96cb96519f6b008cc68a50884d43869bfc76611f5f13f32bf843a26fb898941c", - "url": "https://github.com/docker/buildx/releases/download/v0.9.1/buildx-v0.9.1.windows-arm64.exe" + "file": "buildx-v0.10.0.windows-arm64.exe", + "sha256": "cce25fae4c2f785abcc8ddb8e7136c0baca998013ceb1981f55d61a4f2d0c9df", + "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-arm64.exe" } }, - "version": "0.9.1" + "version": "0.10.0" }, "compose": { "arches": { From 6b2478f8067b8896a2597a658363dbd794412dc2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 19 Jan 2023 15:12:01 -0800 Subject: [PATCH 137/667] Update 23.0-rc to compose 2.15.1 --- 23.0-rc/cli/Dockerfile | 30 +++++++++++++-------------- versions.json | 46 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile index 5c84a07a8..50e028e95 100644 --- a/23.0-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.15.0 +ENV DOCKER_COMPOSE_VERSION 2.15.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64'; \ - sha256='ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64'; \ + sha256='bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6'; \ - sha256='0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6'; \ + sha256='a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7'; \ - sha256='343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7'; \ + sha256='e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64'; \ - sha256='634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64'; \ + sha256='14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le'; \ - sha256='236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le'; \ + sha256='bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64'; \ - sha256='365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64'; \ + sha256='9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x'; \ - sha256='8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f'; \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x'; \ + sha256='cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 3c1188653..2e2a517e8 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ba481d45be2b137a2a185abd05f61d6d7766dbedfa038f16e4705760767a206e", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-x86_64" + "sha256": "bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "0f46aea568f35decc22e1db6af76decaf1c36b9bb374610bc08c3b3618170f8f", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv6" + "sha256": "a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "343b552c61d74446fc8e8ce7695f878cb2ad49f7fae98deb7fb76a37f24c251e", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-armv7" + "sha256": "e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "634e397090ca0e857a898d853ab08d7e2f226328b305026c143c68d6ce0686de", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-aarch64" + "sha256": "14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c3d5ca2385456796105501e32e75593bfc1c17f234ae38de7ed92d41b21c3135", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-x86_64" + "sha256": "c7557765509407bc4f7325f4220a9317ecbb96c9eebfbd0ab37a27ab5002b1d5", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "9e0d177912d4bfa4eeb139b3d24d4a4312e1cf6018c8d97ec2066f6a4c254e1a", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-darwin-aarch64" + "sha256": "b327335bee9df885f245d4eb77dd89acbde865d3ecbab8267a1319385f5f063a", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "236831ebb63ad30fe716bf22946c91e21b1277bff2785a8538e616168a0d93f1", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-ppc64le" + "sha256": "bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "365d9bf34ae7a2ad0dc028d13363c8c427db1300b1335834a4e06b7e4fa412af", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-riscv64" + "sha256": "9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "8072776b50f34d135f90c8118da60749435b2474afee3df96bbd9c95755f7a2f", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-linux-s390x" + "sha256": "cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "cf909a218e82e0bb48a72d1dc6c0bff7564d71c9b61aeb103305bd72c7822c04", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-x86_64.exe" + "sha256": "538598025dc9ae41298abf859d5b312fba40359c691d9b14527375f4633cbe65", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "52b9be45cac1c6b898cf5d845fe04be380529d25dbe470f4c956d14cb7184072", - "url": "https://github.com/docker/compose/releases/download/v2.15.0/docker-compose-windows-aarch64.exe" + "sha256": "76ad1680eb8c8bb1236243f56fc8c693e377408603bbbc5511d2d491aea2971b", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.15.0" + "version": "2.15.1" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 4abc6d9dadc3876b11aac5abf84d501d7ee0d318 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 19 Jan 2023 22:04:16 -0800 Subject: [PATCH 138/667] Update 20.10 to 20.10.23 --- 20.10/cli/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/dind/Dockerfile | 8 ++++---- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 9f7b27f43..44d897c69 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -19,23 +19,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 20.10.22 +ENV DOCKER_VERSION 20.10.23 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.22.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.22.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.22.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.23.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.22.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.23.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index f8dfcfa16..63fdcf5ac 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.22.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.23.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.22.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.23.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index e4d90cc83..10503c8c7 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/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-20.10.22.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.22.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.22.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.23.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.22.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.23.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 2e26f5975..ffbc5e692 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.22 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.22.zip +ENV DOCKER_VERSION 20.10.23 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.23.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index fbd12d267..9a8a6a064 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.22 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.22.zip +ENV DOCKER_VERSION 20.10.23 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.23.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/versions.json b/versions.json index 2e2a517e8..5ad907a08 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "20.10": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.22.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.22.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.23.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.22.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.22.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.23.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.22.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.22.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.23.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.23.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.22.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.23.zip" } }, "buildx": { @@ -138,7 +138,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.22" + "version": "20.10.23" }, "20.10-rc": null, "23.0": null, From 7a7c807686f54b67646bc75d2c81a68f9a906dbd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 20 Jan 2023 15:27:49 -0800 Subject: [PATCH 139/667] Update 23.0-rc to 23.0.0-rc.3 --- 23.0-rc/cli/Dockerfile | 10 +++++----- 23.0-rc/dind-rootless/Dockerfile | 4 ++-- 23.0-rc/dind/Dockerfile | 8 ++++---- .../windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile index 50e028e95..2a044185e 100644 --- a/23.0-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -19,23 +19,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.0-rc.2 +ENV DOCKER_VERSION 23.0.0-rc.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0-rc/dind-rootless/Dockerfile b/23.0-rc/dind-rootless/Dockerfile index 4154277fd..f3db23134 100644 --- a/23.0-rc/dind-rootless/Dockerfile +++ b/23.0-rc/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/test/x86_64/docker-rootless-extras-23.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0-rc/dind/Dockerfile b/23.0-rc/dind/Dockerfile index 8e06c894c..8ce7954f9 100644 --- a/23.0-rc/dind/Dockerfile +++ b/23.0-rc/dind/Dockerfile @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0-rc/windows/windowsservercore-1809/Dockerfile b/23.0-rc/windows/windowsservercore-1809/Dockerfile index de84c0af5..627f822d2 100644 --- a/23.0-rc/windows/windowsservercore-1809/Dockerfile +++ b/23.0-rc/windows/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.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.2.zip +ENV DOCKER_VERSION 23.0.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.3.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/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile b/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile index 73a1180ef..1d0974465 100644 --- a/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0-rc/windows/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.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.2.zip +ENV DOCKER_VERSION 23.0.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.3.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/versions.json b/versions.json index 5ad907a08..e08342a18 100644 --- a/versions.json +++ b/versions.json @@ -145,21 +145,21 @@ "23.0-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.2.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.3.zip" } }, "buildx": { @@ -281,6 +281,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "23.0.0-rc.2" + "version": "23.0.0-rc.3" } } From 01890140c36e50cb3d035cba6765800f8e3295b8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 26 Jan 2023 22:04:17 -0800 Subject: [PATCH 140/667] Update 20.10 to buildx 0.10.1 --- 20.10/cli/Dockerfile | 30 ++++++++++++------------ versions.json | 56 ++++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 44d897c69..305629e8b 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.0 +ENV DOCKER_BUILDX_VERSION 0.10.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64'; \ - sha256='f76047e43cd2526a870b9cf385effc7c9642c1a17d144559c43545525415867d'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64'; \ + sha256='31be610820f12fdf5e1c310886e95856e659f647e26965f819bd728dcc94fe18'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6'; \ - sha256='dc037b64e14388cbf5441d3b23a3f1ccd9a56a47007555ce681d89b70d411d31'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6'; \ + sha256='60c0044dca2c82bc336af15c5529262a88ce4509e75ad5730db10bf688820b0e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7'; \ - sha256='19b82ba259d83cc75b12bddb1cdc0712dd276f8763d0a65ded2048193973260b'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7'; \ + sha256='2ee39cf64dcf64505f1c7d6213052b8bda39b06e1410c21098d3ca5a3eb72fe7'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64'; \ - sha256='abf375431775d46139312591aa9471cdf6909d8a4e8392b73940ca136c34eb4d'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64'; \ + sha256='1561306348d5ffd63b2fe5e32f3440dd4e8751faf94ffa3103364cb94818f5ef'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le'; \ - sha256='9850f6ad445d1014a156c33ac7f9074fffd3358db304ef5b4e4509355a4d9fb9'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le'; \ + sha256='1cf2e28fa82064bc05c8a69a2a0b798c7adbe572e53042a4dcd604ae9f0103ad'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64'; \ - sha256='07529564e5b2f1f6e33fbf947700f9118a727dde2d8486c3e2115bc4fb42d86a'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64'; \ + sha256='46e2188c265b684f224a3fbdb11a40531057e278a580cd3ca01b2042f48c492b'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x'; \ - sha256='871b4a746765334a1a0b56700525d5ef7f83adcafbb193734e238c8ac102eccc'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x'; \ + sha256='e4cecfa4c4489385c4cb1ce6f9f518c9afce63705588088c5d32c7c286c9c41a'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index e08342a18..140ade4aa 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.0.linux-amd64", - "sha256": "f76047e43cd2526a870b9cf385effc7c9642c1a17d144559c43545525415867d", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64" + "file": "buildx-v0.10.1.linux-amd64", + "sha256": "31be610820f12fdf5e1c310886e95856e659f647e26965f819bd728dcc94fe18", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.0.linux-arm-v6", - "sha256": "dc037b64e14388cbf5441d3b23a3f1ccd9a56a47007555ce681d89b70d411d31", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6" + "file": "buildx-v0.10.1.linux-arm-v6", + "sha256": "60c0044dca2c82bc336af15c5529262a88ce4509e75ad5730db10bf688820b0e", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.0.linux-arm-v7", - "sha256": "19b82ba259d83cc75b12bddb1cdc0712dd276f8763d0a65ded2048193973260b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7" + "file": "buildx-v0.10.1.linux-arm-v7", + "sha256": "2ee39cf64dcf64505f1c7d6213052b8bda39b06e1410c21098d3ca5a3eb72fe7", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.0.linux-arm64", - "sha256": "abf375431775d46139312591aa9471cdf6909d8a4e8392b73940ca136c34eb4d", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64" + "file": "buildx-v0.10.1.linux-arm64", + "sha256": "1561306348d5ffd63b2fe5e32f3440dd4e8751faf94ffa3103364cb94818f5ef", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.0.linux-ppc64le", - "sha256": "9850f6ad445d1014a156c33ac7f9074fffd3358db304ef5b4e4509355a4d9fb9", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le" + "file": "buildx-v0.10.1.linux-ppc64le", + "sha256": "1cf2e28fa82064bc05c8a69a2a0b798c7adbe572e53042a4dcd604ae9f0103ad", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.0.linux-riscv64", - "sha256": "07529564e5b2f1f6e33fbf947700f9118a727dde2d8486c3e2115bc4fb42d86a", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64" + "file": "buildx-v0.10.1.linux-riscv64", + "sha256": "46e2188c265b684f224a3fbdb11a40531057e278a580cd3ca01b2042f48c492b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.0.linux-s390x", - "sha256": "871b4a746765334a1a0b56700525d5ef7f83adcafbb193734e238c8ac102eccc", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x" + "file": "buildx-v0.10.1.linux-s390x", + "sha256": "e4cecfa4c4489385c4cb1ce6f9f518c9afce63705588088c5d32c7c286c9c41a", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.0.windows-amd64.exe", - "sha256": "9b2832b8e97fcf8a67fa94dd2cc293c60aaf7eabab9c2c40fdeb303458a3207f", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-amd64.exe" + "file": "buildx-v0.10.1.windows-amd64.exe", + "sha256": "8d0cfb383b14b12aefb3c1313cf506505bf74d05eba38af570e70a05b5ef3bef", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.0.windows-arm64.exe", - "sha256": "cce25fae4c2f785abcc8ddb8e7136c0baca998013ceb1981f55d61a4f2d0c9df", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-arm64.exe" + "file": "buildx-v0.10.1.windows-arm64.exe", + "sha256": "3780eb212d05c4a69a26925640eb3902e904ccd48ec20865b03994126017c3db", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-arm64.exe" } }, - "version": "0.10.0" + "version": "0.10.1" }, "compose": { "arches": { From 4904d1d77c6a11cf526f01ccdf6729e3e8c547ec Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 26 Jan 2023 22:06:51 -0800 Subject: [PATCH 141/667] Update 23.0-rc to buildx 0.10.1 --- 23.0-rc/cli/Dockerfile | 30 +++++++++++----------- versions.json | 56 +++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile index 2a044185e..d0b6adbbf 100644 --- a/23.0-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.0 +ENV DOCKER_BUILDX_VERSION 0.10.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64'; \ - sha256='f76047e43cd2526a870b9cf385effc7c9642c1a17d144559c43545525415867d'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64'; \ + sha256='31be610820f12fdf5e1c310886e95856e659f647e26965f819bd728dcc94fe18'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6'; \ - sha256='dc037b64e14388cbf5441d3b23a3f1ccd9a56a47007555ce681d89b70d411d31'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6'; \ + sha256='60c0044dca2c82bc336af15c5529262a88ce4509e75ad5730db10bf688820b0e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7'; \ - sha256='19b82ba259d83cc75b12bddb1cdc0712dd276f8763d0a65ded2048193973260b'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7'; \ + sha256='2ee39cf64dcf64505f1c7d6213052b8bda39b06e1410c21098d3ca5a3eb72fe7'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64'; \ - sha256='abf375431775d46139312591aa9471cdf6909d8a4e8392b73940ca136c34eb4d'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64'; \ + sha256='1561306348d5ffd63b2fe5e32f3440dd4e8751faf94ffa3103364cb94818f5ef'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le'; \ - sha256='9850f6ad445d1014a156c33ac7f9074fffd3358db304ef5b4e4509355a4d9fb9'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le'; \ + sha256='1cf2e28fa82064bc05c8a69a2a0b798c7adbe572e53042a4dcd604ae9f0103ad'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64'; \ - sha256='07529564e5b2f1f6e33fbf947700f9118a727dde2d8486c3e2115bc4fb42d86a'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64'; \ + sha256='46e2188c265b684f224a3fbdb11a40531057e278a580cd3ca01b2042f48c492b'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x'; \ - sha256='871b4a746765334a1a0b56700525d5ef7f83adcafbb193734e238c8ac102eccc'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x'; \ + sha256='e4cecfa4c4489385c4cb1ce6f9f518c9afce63705588088c5d32c7c286c9c41a'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 140ade4aa..520dbf9cb 100644 --- a/versions.json +++ b/versions.json @@ -165,52 +165,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.0.linux-amd64", - "sha256": "f76047e43cd2526a870b9cf385effc7c9642c1a17d144559c43545525415867d", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-amd64" + "file": "buildx-v0.10.1.linux-amd64", + "sha256": "31be610820f12fdf5e1c310886e95856e659f647e26965f819bd728dcc94fe18", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.0.linux-arm-v6", - "sha256": "dc037b64e14388cbf5441d3b23a3f1ccd9a56a47007555ce681d89b70d411d31", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v6" + "file": "buildx-v0.10.1.linux-arm-v6", + "sha256": "60c0044dca2c82bc336af15c5529262a88ce4509e75ad5730db10bf688820b0e", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.0.linux-arm-v7", - "sha256": "19b82ba259d83cc75b12bddb1cdc0712dd276f8763d0a65ded2048193973260b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm-v7" + "file": "buildx-v0.10.1.linux-arm-v7", + "sha256": "2ee39cf64dcf64505f1c7d6213052b8bda39b06e1410c21098d3ca5a3eb72fe7", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.0.linux-arm64", - "sha256": "abf375431775d46139312591aa9471cdf6909d8a4e8392b73940ca136c34eb4d", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-arm64" + "file": "buildx-v0.10.1.linux-arm64", + "sha256": "1561306348d5ffd63b2fe5e32f3440dd4e8751faf94ffa3103364cb94818f5ef", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.0.linux-ppc64le", - "sha256": "9850f6ad445d1014a156c33ac7f9074fffd3358db304ef5b4e4509355a4d9fb9", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-ppc64le" + "file": "buildx-v0.10.1.linux-ppc64le", + "sha256": "1cf2e28fa82064bc05c8a69a2a0b798c7adbe572e53042a4dcd604ae9f0103ad", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.0.linux-riscv64", - "sha256": "07529564e5b2f1f6e33fbf947700f9118a727dde2d8486c3e2115bc4fb42d86a", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-riscv64" + "file": "buildx-v0.10.1.linux-riscv64", + "sha256": "46e2188c265b684f224a3fbdb11a40531057e278a580cd3ca01b2042f48c492b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.0.linux-s390x", - "sha256": "871b4a746765334a1a0b56700525d5ef7f83adcafbb193734e238c8ac102eccc", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.linux-s390x" + "file": "buildx-v0.10.1.linux-s390x", + "sha256": "e4cecfa4c4489385c4cb1ce6f9f518c9afce63705588088c5d32c7c286c9c41a", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.0.windows-amd64.exe", - "sha256": "9b2832b8e97fcf8a67fa94dd2cc293c60aaf7eabab9c2c40fdeb303458a3207f", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-amd64.exe" + "file": "buildx-v0.10.1.windows-amd64.exe", + "sha256": "8d0cfb383b14b12aefb3c1313cf506505bf74d05eba38af570e70a05b5ef3bef", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.0.windows-arm64.exe", - "sha256": "cce25fae4c2f785abcc8ddb8e7136c0baca998013ceb1981f55d61a4f2d0c9df", - "url": "https://github.com/docker/buildx/releases/download/v0.10.0/buildx-v0.10.0.windows-arm64.exe" + "file": "buildx-v0.10.1.windows-arm64.exe", + "sha256": "3780eb212d05c4a69a26925640eb3902e904ccd48ec20865b03994126017c3db", + "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-arm64.exe" } }, - "version": "0.10.0" + "version": "0.10.1" }, "compose": { "arches": { From 4855ede4876923c0c5a663cd23e1d314d3e3d5e5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 30 Jan 2023 16:04:17 -0800 Subject: [PATCH 142/667] Update 20.10 to buildx 0.10.2 --- 20.10/cli/Dockerfile | 30 ++++++++++++------------ versions.json | 56 ++++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 305629e8b..2208f99d2 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.1 +ENV DOCKER_BUILDX_VERSION 0.10.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64'; \ - sha256='31be610820f12fdf5e1c310886e95856e659f647e26965f819bd728dcc94fe18'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64'; \ + sha256='ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6'; \ - sha256='60c0044dca2c82bc336af15c5529262a88ce4509e75ad5730db10bf688820b0e'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6'; \ + sha256='4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7'; \ - sha256='2ee39cf64dcf64505f1c7d6213052b8bda39b06e1410c21098d3ca5a3eb72fe7'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7'; \ + sha256='d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64'; \ - sha256='1561306348d5ffd63b2fe5e32f3440dd4e8751faf94ffa3103364cb94818f5ef'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64'; \ + sha256='5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le'; \ - sha256='1cf2e28fa82064bc05c8a69a2a0b798c7adbe572e53042a4dcd604ae9f0103ad'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le'; \ + sha256='fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64'; \ - sha256='46e2188c265b684f224a3fbdb11a40531057e278a580cd3ca01b2042f48c492b'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64'; \ + sha256='b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x'; \ - sha256='e4cecfa4c4489385c4cb1ce6f9f518c9afce63705588088c5d32c7c286c9c41a'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x'; \ + sha256='9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 520dbf9cb..159efaaf0 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.1.linux-amd64", - "sha256": "31be610820f12fdf5e1c310886e95856e659f647e26965f819bd728dcc94fe18", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64" + "file": "buildx-v0.10.2.linux-amd64", + "sha256": "ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.1.linux-arm-v6", - "sha256": "60c0044dca2c82bc336af15c5529262a88ce4509e75ad5730db10bf688820b0e", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6" + "file": "buildx-v0.10.2.linux-arm-v6", + "sha256": "4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.1.linux-arm-v7", - "sha256": "2ee39cf64dcf64505f1c7d6213052b8bda39b06e1410c21098d3ca5a3eb72fe7", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7" + "file": "buildx-v0.10.2.linux-arm-v7", + "sha256": "d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.1.linux-arm64", - "sha256": "1561306348d5ffd63b2fe5e32f3440dd4e8751faf94ffa3103364cb94818f5ef", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64" + "file": "buildx-v0.10.2.linux-arm64", + "sha256": "5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.1.linux-ppc64le", - "sha256": "1cf2e28fa82064bc05c8a69a2a0b798c7adbe572e53042a4dcd604ae9f0103ad", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le" + "file": "buildx-v0.10.2.linux-ppc64le", + "sha256": "fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.1.linux-riscv64", - "sha256": "46e2188c265b684f224a3fbdb11a40531057e278a580cd3ca01b2042f48c492b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64" + "file": "buildx-v0.10.2.linux-riscv64", + "sha256": "b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.1.linux-s390x", - "sha256": "e4cecfa4c4489385c4cb1ce6f9f518c9afce63705588088c5d32c7c286c9c41a", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x" + "file": "buildx-v0.10.2.linux-s390x", + "sha256": "9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.1.windows-amd64.exe", - "sha256": "8d0cfb383b14b12aefb3c1313cf506505bf74d05eba38af570e70a05b5ef3bef", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-amd64.exe" + "file": "buildx-v0.10.2.windows-amd64.exe", + "sha256": "04e869c832c966b07b4418921549fc5d97fe90218d83a1be28304c3e33dd4660", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.1.windows-arm64.exe", - "sha256": "3780eb212d05c4a69a26925640eb3902e904ccd48ec20865b03994126017c3db", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-arm64.exe" + "file": "buildx-v0.10.2.windows-arm64.exe", + "sha256": "a4bd81ddb5506ef096a134f48b608c9b89297a9d2d72f6c695adcece84c28a4d", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.exe" } }, - "version": "0.10.1" + "version": "0.10.2" }, "compose": { "arches": { From 219095a5df21d96ea80078ef748196b9420e293a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 30 Jan 2023 16:06:48 -0800 Subject: [PATCH 143/667] Update 23.0-rc to buildx 0.10.2 --- 23.0-rc/cli/Dockerfile | 30 +++++++++++----------- versions.json | 56 +++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile index d0b6adbbf..f12095481 100644 --- a/23.0-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.1 +ENV DOCKER_BUILDX_VERSION 0.10.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64'; \ - sha256='31be610820f12fdf5e1c310886e95856e659f647e26965f819bd728dcc94fe18'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64'; \ + sha256='ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6'; \ - sha256='60c0044dca2c82bc336af15c5529262a88ce4509e75ad5730db10bf688820b0e'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6'; \ + sha256='4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7'; \ - sha256='2ee39cf64dcf64505f1c7d6213052b8bda39b06e1410c21098d3ca5a3eb72fe7'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7'; \ + sha256='d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64'; \ - sha256='1561306348d5ffd63b2fe5e32f3440dd4e8751faf94ffa3103364cb94818f5ef'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64'; \ + sha256='5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le'; \ - sha256='1cf2e28fa82064bc05c8a69a2a0b798c7adbe572e53042a4dcd604ae9f0103ad'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le'; \ + sha256='fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64'; \ - sha256='46e2188c265b684f224a3fbdb11a40531057e278a580cd3ca01b2042f48c492b'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64'; \ + sha256='b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x'; \ - sha256='e4cecfa4c4489385c4cb1ce6f9f518c9afce63705588088c5d32c7c286c9c41a'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x'; \ + sha256='9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 159efaaf0..187898fb7 100644 --- a/versions.json +++ b/versions.json @@ -165,52 +165,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.1.linux-amd64", - "sha256": "31be610820f12fdf5e1c310886e95856e659f647e26965f819bd728dcc94fe18", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-amd64" + "file": "buildx-v0.10.2.linux-amd64", + "sha256": "ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.1.linux-arm-v6", - "sha256": "60c0044dca2c82bc336af15c5529262a88ce4509e75ad5730db10bf688820b0e", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v6" + "file": "buildx-v0.10.2.linux-arm-v6", + "sha256": "4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.1.linux-arm-v7", - "sha256": "2ee39cf64dcf64505f1c7d6213052b8bda39b06e1410c21098d3ca5a3eb72fe7", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm-v7" + "file": "buildx-v0.10.2.linux-arm-v7", + "sha256": "d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.1.linux-arm64", - "sha256": "1561306348d5ffd63b2fe5e32f3440dd4e8751faf94ffa3103364cb94818f5ef", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-arm64" + "file": "buildx-v0.10.2.linux-arm64", + "sha256": "5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.1.linux-ppc64le", - "sha256": "1cf2e28fa82064bc05c8a69a2a0b798c7adbe572e53042a4dcd604ae9f0103ad", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-ppc64le" + "file": "buildx-v0.10.2.linux-ppc64le", + "sha256": "fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.1.linux-riscv64", - "sha256": "46e2188c265b684f224a3fbdb11a40531057e278a580cd3ca01b2042f48c492b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-riscv64" + "file": "buildx-v0.10.2.linux-riscv64", + "sha256": "b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.1.linux-s390x", - "sha256": "e4cecfa4c4489385c4cb1ce6f9f518c9afce63705588088c5d32c7c286c9c41a", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.linux-s390x" + "file": "buildx-v0.10.2.linux-s390x", + "sha256": "9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.1.windows-amd64.exe", - "sha256": "8d0cfb383b14b12aefb3c1313cf506505bf74d05eba38af570e70a05b5ef3bef", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-amd64.exe" + "file": "buildx-v0.10.2.windows-amd64.exe", + "sha256": "04e869c832c966b07b4418921549fc5d97fe90218d83a1be28304c3e33dd4660", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.1.windows-arm64.exe", - "sha256": "3780eb212d05c4a69a26925640eb3902e904ccd48ec20865b03994126017c3db", - "url": "https://github.com/docker/buildx/releases/download/v0.10.1/buildx-v0.10.1.windows-arm64.exe" + "file": "buildx-v0.10.2.windows-arm64.exe", + "sha256": "a4bd81ddb5506ef096a134f48b608c9b89297a9d2d72f6c695adcece84c28a4d", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.exe" } }, - "version": "0.10.1" + "version": "0.10.2" }, "compose": { "arches": { From cb39cb27e89ff8ae2a30cf24acac5c1a385e62d8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 1 Feb 2023 09:57:05 -0800 Subject: [PATCH 144/667] Update 23.0-rc to 23.0.0-rc.4 --- 23.0-rc/cli/Dockerfile | 10 +++++----- 23.0-rc/dind-rootless/Dockerfile | 4 ++-- 23.0-rc/dind/Dockerfile | 8 ++++---- .../windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile index f12095481..a4ab08a1b 100644 --- a/23.0-rc/cli/Dockerfile +++ b/23.0-rc/cli/Dockerfile @@ -19,23 +19,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.0-rc.3 +ENV DOCKER_VERSION 23.0.0-rc.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0-rc/dind-rootless/Dockerfile b/23.0-rc/dind-rootless/Dockerfile index f3db23134..2aef497af 100644 --- a/23.0-rc/dind-rootless/Dockerfile +++ b/23.0-rc/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/test/x86_64/docker-rootless-extras-23.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0-rc/dind/Dockerfile b/23.0-rc/dind/Dockerfile index 8ce7954f9..de40e9a79 100644 --- a/23.0-rc/dind/Dockerfile +++ b/23.0-rc/dind/Dockerfile @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0-rc/windows/windowsservercore-1809/Dockerfile b/23.0-rc/windows/windowsservercore-1809/Dockerfile index 627f822d2..51cf213b7 100644 --- a/23.0-rc/windows/windowsservercore-1809/Dockerfile +++ b/23.0-rc/windows/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.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.3.zip +ENV DOCKER_VERSION 23.0.0-rc.4 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.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/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile b/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile index 1d0974465..92a827ee1 100644 --- a/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0-rc/windows/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.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.3.zip +ENV DOCKER_VERSION 23.0.0-rc.4 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.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/versions.json b/versions.json index 187898fb7..87aa65006 100644 --- a/versions.json +++ b/versions.json @@ -145,21 +145,21 @@ "23.0-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.4.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.4.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.4.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.4.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.3.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.4.zip" } }, "buildx": { @@ -281,6 +281,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "23.0.0-rc.3" + "version": "23.0.0-rc.4" } } From 849b56e6c81dc509da780121352f844e8f26bb7a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 2 Feb 2023 04:04:27 -0800 Subject: [PATCH 145/667] Update 23.0 to 23.0.0, buildx 0.10.2, compose 2.15.1 --- 23.0/cli/Dockerfile | 163 ++++++++++++++ 23.0/cli/docker-entrypoint.sh | 61 ++++++ 23.0/cli/modprobe.sh | 20 ++ 23.0/dind-rootless/Dockerfile | 55 +++++ 23.0/dind/Dockerfile | 89 ++++++++ 23.0/dind/dockerd-entrypoint.sh | 198 ++++++++++++++++++ 23.0/git/Dockerfile | 9 + .../windows/windowsservercore-1809/Dockerfile | 40 ++++ .../windowsservercore-ltsc2022/Dockerfile | 40 ++++ versions.json | 142 ++++++++++++- 10 files changed, 816 insertions(+), 1 deletion(-) create mode 100644 23.0/cli/Dockerfile create mode 100755 23.0/cli/docker-entrypoint.sh create mode 100755 23.0/cli/modprobe.sh create mode 100644 23.0/dind-rootless/Dockerfile create mode 100644 23.0/dind/Dockerfile create mode 100755 23.0/dind/dockerd-entrypoint.sh create mode 100644 23.0/git/Dockerfile create mode 100644 23.0/windows/windowsservercore-1809/Dockerfile create mode 100644 23.0/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile new file mode 100644 index 000000000..ec8c3475f --- /dev/null +++ b/23.0/cli/Dockerfile @@ -0,0 +1,163 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.17 + +RUN apk add --no-cache \ + ca-certificates \ +# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 + libc6-compat \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v20.10.21/hack/make.sh#L115 +# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303 +# - 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.0 + +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.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.10.2 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64'; \ + sha256='ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6'; \ + sha256='4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7'; \ + sha256='d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64'; \ + sha256='5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le'; \ + sha256='fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64'; \ + sha256='b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x'; \ + sha256='9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.15.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64'; \ + sha256='bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6'; \ + sha256='a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7'; \ + sha256='e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64'; \ + sha256='14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le'; \ + sha256='bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64'; \ + sha256='9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x'; \ + sha256='cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/23.0/cli/docker-entrypoint.sh b/23.0/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/23.0/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/23.0/cli/modprobe.sh b/23.0/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/23.0/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/23.0/dind-rootless/Dockerfile b/23.0/dind-rootless/Dockerfile new file mode 100644 index 000000000..2520ce2ca --- /dev/null +++ b/23.0/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:23.0-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +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.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/23.0/dind/Dockerfile b/23.0/dind/Dockerfile new file mode 100644 index 000000000..1038929c1 --- /dev/null +++ b/23.0/dind/Dockerfile @@ -0,0 +1,89 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:23.0-cli + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + ip6tables \ + iptables \ + openssl \ + shadow-uidmap \ + xfsprogs \ + xz \ +# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) + pigz \ + ; \ +# only install zfs if it's available for the current architecture +# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) +# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch + if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ + apk add --no-cache zfs; \ + fi + +# TODO aufs-tools + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +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.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:23.0-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 1f32e3c95d72a29b3eaacba156ed675dba976cb5 + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/23.0/dind/dockerd-entrypoint.sh b/23.0/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..38bc26293 --- /dev/null +++ b/23.0/dind/dockerd-entrypoint.sh @@ -0,0 +1,198 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ + && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ + ; then + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + if dockerd --version | grep -qF ' 20.10.'; then + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + fi + + if ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + modprobe ip_tables || : + fi + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/23.0/git/Dockerfile b/23.0/git/Dockerfile new file mode 100644 index 000000000..51aca7971 --- /dev/null +++ b/23.0/git/Dockerfile @@ -0,0 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:23.0-cli + +RUN apk add --no-cache git diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..ea31faf03 --- /dev/null +++ b/23.0/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,40 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 23.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; diff --git a/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..c5f803d4d --- /dev/null +++ b/23.0/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,40 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 23.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 87aa65006..1d7cd15a6 100644 --- a/versions.json +++ b/versions.json @@ -141,7 +141,147 @@ "version": "20.10.23" }, "20.10-rc": null, - "23.0": null, + "23.0": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.0.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.0.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.0.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.0.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.0.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.10.2.linux-amd64", + "sha256": "ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.10.2.linux-arm-v6", + "sha256": "4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.10.2.linux-arm-v7", + "sha256": "d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.10.2.linux-arm64", + "sha256": "5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.10.2.linux-ppc64le", + "sha256": "fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.10.2.linux-riscv64", + "sha256": "b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.10.2.linux-s390x", + "sha256": "9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.10.2.windows-amd64.exe", + "sha256": "04e869c832c966b07b4418921549fc5d97fe90218d83a1be28304c3e33dd4660", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.10.2.windows-arm64.exe", + "sha256": "a4bd81ddb5506ef096a134f48b608c9b89297a9d2d72f6c695adcece84c28a4d", + "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.exe" + } + }, + "version": "0.10.2" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "c7557765509407bc4f7325f4220a9317ecbb96c9eebfbd0ab37a27ab5002b1d5", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "b327335bee9df885f245d4eb77dd89acbde865d3ecbab8267a1319385f5f063a", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "538598025dc9ae41298abf859d5b312fba40359c691d9b14527375f4633cbe65", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "76ad1680eb8c8bb1236243f56fc8c693e377408603bbbc5511d2d491aea2971b", + "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.15.1" + }, + "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", + "variants": [ + "cli", + "dind", + "dind-rootless", + "git", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "23.0.0" + }, "23.0-rc": { "arches": { "amd64": { From 0acd50716cb020ec30a830ace603d073412c6d62 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 2 Feb 2023 04:06:52 -0800 Subject: [PATCH 146/667] Update 23.0-rc --- 23.0-rc/cli/Dockerfile | 163 -------------- 23.0-rc/cli/docker-entrypoint.sh | 61 ------ 23.0-rc/cli/modprobe.sh | 20 -- 23.0-rc/dind-rootless/Dockerfile | 55 ----- 23.0-rc/dind/Dockerfile | 89 -------- 23.0-rc/dind/dockerd-entrypoint.sh | 198 ------------------ 23.0-rc/git/Dockerfile | 9 - .../windows/windowsservercore-1809/Dockerfile | 40 ---- .../windowsservercore-ltsc2022/Dockerfile | 40 ---- versions.json | 142 +------------ 10 files changed, 1 insertion(+), 816 deletions(-) delete mode 100644 23.0-rc/cli/Dockerfile delete mode 100755 23.0-rc/cli/docker-entrypoint.sh delete mode 100755 23.0-rc/cli/modprobe.sh delete mode 100644 23.0-rc/dind-rootless/Dockerfile delete mode 100644 23.0-rc/dind/Dockerfile delete mode 100755 23.0-rc/dind/dockerd-entrypoint.sh delete mode 100644 23.0-rc/git/Dockerfile delete mode 100644 23.0-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/23.0-rc/cli/Dockerfile b/23.0-rc/cli/Dockerfile deleted file mode 100644 index a4ab08a1b..000000000 --- a/23.0-rc/cli/Dockerfile +++ /dev/null @@ -1,163 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.17 - -RUN apk add --no-cache \ - ca-certificates \ -# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 - libc6-compat \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v20.10.21/hack/make.sh#L115 -# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303 -# - 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.0-rc.4 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.4.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.4.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.4.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.4.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.10.2 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64'; \ - sha256='ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6'; \ - sha256='4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7'; \ - sha256='d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64'; \ - sha256='5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le'; \ - sha256='fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64'; \ - sha256='b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x'; \ - sha256='9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.15.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64'; \ - sha256='bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6'; \ - sha256='a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7'; \ - sha256='e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64'; \ - sha256='14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le'; \ - sha256='bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64'; \ - sha256='9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x'; \ - sha256='cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/23.0-rc/cli/docker-entrypoint.sh b/23.0-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/23.0-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/23.0-rc/cli/modprobe.sh b/23.0-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/23.0-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/23.0-rc/dind-rootless/Dockerfile b/23.0-rc/dind-rootless/Dockerfile deleted file mode 100644 index 2aef497af..000000000 --- a/23.0-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:23.0-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.4.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.4.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/23.0-rc/dind/Dockerfile b/23.0-rc/dind/Dockerfile deleted file mode 100644 index de40e9a79..000000000 --- a/23.0-rc/dind/Dockerfile +++ /dev/null @@ -1,89 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:23.0-rc-cli - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - ip6tables \ - iptables \ - openssl \ - shadow-uidmap \ - xfsprogs \ - xz \ -# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) - pigz \ - ; \ -# only install zfs if it's available for the current architecture -# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) -# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch - if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ - apk add --no-cache zfs; \ - fi - -# TODO aufs-tools - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.4.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.4.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.4.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.4.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:23.0-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 1f32e3c95d72a29b3eaacba156ed675dba976cb5 - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/23.0-rc/dind/dockerd-entrypoint.sh b/23.0-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 38bc26293..000000000 --- a/23.0-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,198 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ - && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ - ; then - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - if dockerd --version | grep -qF ' 20.10.'; then - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - fi - - if ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - modprobe ip_tables || : - fi - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/23.0-rc/git/Dockerfile b/23.0-rc/git/Dockerfile deleted file mode 100644 index 930f57332..000000000 --- a/23.0-rc/git/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:23.0-rc-cli - -RUN apk add --no-cache git diff --git a/23.0-rc/windows/windowsservercore-1809/Dockerfile b/23.0-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 51cf213b7..000000000 --- a/23.0-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 23.0.0-rc.4 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; diff --git a/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile b/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 92a827ee1..000000000 --- a/23.0-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 23.0.0-rc.4 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 1d7cd15a6..f37a8d311 100644 --- a/versions.json +++ b/versions.json @@ -282,145 +282,5 @@ ], "version": "23.0.0" }, - "23.0-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.4.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.4.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.4.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.4.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.4.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.10.2.linux-amd64", - "sha256": "ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.10.2.linux-arm-v6", - "sha256": "4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.10.2.linux-arm-v7", - "sha256": "d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.10.2.linux-arm64", - "sha256": "5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64" - }, - "ppc64le": { - "file": "buildx-v0.10.2.linux-ppc64le", - "sha256": "fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.10.2.linux-riscv64", - "sha256": "b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.10.2.linux-s390x", - "sha256": "9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.10.2.windows-amd64.exe", - "sha256": "04e869c832c966b07b4418921549fc5d97fe90218d83a1be28304c3e33dd4660", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.10.2.windows-arm64.exe", - "sha256": "a4bd81ddb5506ef096a134f48b608c9b89297a9d2d72f6c695adcece84c28a4d", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.exe" - } - }, - "version": "0.10.2" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "c7557765509407bc4f7325f4220a9317ecbb96c9eebfbd0ab37a27ab5002b1d5", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "b327335bee9df885f245d4eb77dd89acbde865d3ecbab8267a1319385f5f063a", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "538598025dc9ae41298abf859d5b312fba40359c691d9b14527375f4633cbe65", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "76ad1680eb8c8bb1236243f56fc8c693e377408603bbbc5511d2d491aea2971b", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.15.1" - }, - "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", - "variants": [ - "cli", - "dind", - "dind-rootless", - "git", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "23.0.0-rc.4" - } + "23.0-rc": null } From 38e13c81eb5cb5b10d4477467547b0823d877720 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 3 Feb 2023 11:22:19 -0800 Subject: [PATCH 147/667] prevent tls being disabled if _tls_generate_certs fails --- 20.10/dind/dockerd-entrypoint.sh | 11 +++++------ 23.0/dind/dockerd-entrypoint.sh | 11 +++++------ dockerd-entrypoint.sh | 11 +++++------ 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/20.10/dind/dockerd-entrypoint.sh b/20.10/dind/dockerd-entrypoint.sh index 38bc26293..caf382300 100755 --- a/20.10/dind/dockerd-entrypoint.sh +++ b/20.10/dind/dockerd-entrypoint.sh @@ -108,12 +108,11 @@ if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then esac # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ - && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ - ; then + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] + [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] + [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] # generate certs and use TLS if requested/possible (default in 19.03+) set -- dockerd \ --host="$dockerSocket" \ diff --git a/23.0/dind/dockerd-entrypoint.sh b/23.0/dind/dockerd-entrypoint.sh index 38bc26293..caf382300 100755 --- a/23.0/dind/dockerd-entrypoint.sh +++ b/23.0/dind/dockerd-entrypoint.sh @@ -108,12 +108,11 @@ if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then esac # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ - && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ - ; then + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] + [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] + [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] # generate certs and use TLS if requested/possible (default in 19.03+) set -- dockerd \ --host="$dockerSocket" \ diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 38bc26293..caf382300 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -108,12 +108,11 @@ if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then esac # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && _tls_generate_certs "$DOCKER_TLS_CERTDIR" \ - && [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] \ - ; then + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] + [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] + [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] # generate certs and use TLS if requested/possible (default in 19.03+) set -- dockerd \ --host="$dockerSocket" \ From dbd6b97c257242d05f1ade073acd1b3195ac2c75 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 8 Feb 2023 10:04:24 -0800 Subject: [PATCH 148/667] Update 20.10 to compose 2.16.0 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 2208f99d2..dbde134c2 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.15.1 +ENV DOCKER_COMPOSE_VERSION 2.16.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64'; \ - sha256='bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64'; \ + sha256='54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6'; \ - sha256='a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6'; \ + sha256='59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7'; \ - sha256='e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7'; \ + sha256='558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64'; \ - sha256='14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64'; \ + sha256='edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le'; \ - sha256='bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le'; \ + sha256='aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64'; \ - sha256='9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64'; \ + sha256='8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x'; \ - sha256='cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x'; \ + sha256='fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index f37a8d311..a0f90b318 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64" + "sha256": "54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6" + "sha256": "59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7" + "sha256": "558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64" + "sha256": "edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c7557765509407bc4f7325f4220a9317ecbb96c9eebfbd0ab37a27ab5002b1d5", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-x86_64" + "sha256": "2bf40f35b107551486dc46c5c0dcd0027dfadd8f129cccc37a034848ef2288b9", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "b327335bee9df885f245d4eb77dd89acbde865d3ecbab8267a1319385f5f063a", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-aarch64" + "sha256": "975dfb3860e6777b9b383a1eb1f5cdbc5c3aba085149a8c9efbe74d9c50740d1", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le" + "sha256": "aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64" + "sha256": "8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x" + "sha256": "fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "538598025dc9ae41298abf859d5b312fba40359c691d9b14527375f4633cbe65", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-x86_64.exe" + "sha256": "a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "76ad1680eb8c8bb1236243f56fc8c693e377408603bbbc5511d2d491aea2971b", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-aarch64.exe" + "sha256": "3be36960ef77ad89008bfd6b6e23cac6d7b803f34f03951949b7d773921f1b0e", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.15.1" + "version": "2.16.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From f7c1eb20c9898f56999cb594a99418e93e772d5d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 8 Feb 2023 10:06:48 -0800 Subject: [PATCH 149/667] Update 23.0 to compose 2.16.0 --- 23.0/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index ec8c3475f..71182efcb 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.15.1 +ENV DOCKER_COMPOSE_VERSION 2.16.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64'; \ - sha256='bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64'; \ + sha256='54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6'; \ - sha256='a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6'; \ + sha256='59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7'; \ - sha256='e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7'; \ + sha256='558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64'; \ - sha256='14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64'; \ + sha256='edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le'; \ - sha256='bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le'; \ + sha256='aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64'; \ - sha256='9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64'; \ + sha256='8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x'; \ - sha256='cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x'; \ + sha256='fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index a0f90b318..6e808635a 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-x86_64" + "sha256": "54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a8934600100af88f535eb50b45c7d8d2ac37835221803ba2910e0b167b3af22e", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv6" + "sha256": "59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "e5b03ac1258ad4243af0ac4afcb1c6cc8c9956b2483a50309cdb38cdb8387e37", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-armv7" + "sha256": "558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "14d31297794868520cb2e61b543bb1c821aaa484af22b397904314ae8227f6a2", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-aarch64" + "sha256": "edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c7557765509407bc4f7325f4220a9317ecbb96c9eebfbd0ab37a27ab5002b1d5", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-x86_64" + "sha256": "2bf40f35b107551486dc46c5c0dcd0027dfadd8f129cccc37a034848ef2288b9", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "b327335bee9df885f245d4eb77dd89acbde865d3ecbab8267a1319385f5f063a", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-darwin-aarch64" + "sha256": "975dfb3860e6777b9b383a1eb1f5cdbc5c3aba085149a8c9efbe74d9c50740d1", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "bdada874a26d382b20ced7c170707a1ebcf9f20d7d6f394b962076968473ca9c", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-ppc64le" + "sha256": "aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9cc1b9c8de313a1e43b8f3dcca47c29eeb87af3de24c67448c463bf882166430", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-riscv64" + "sha256": "8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "cf311824af115d0bece5d5d60a73464912dad07cdd00fdaa469dabbcad60f289", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-linux-s390x" + "sha256": "fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "538598025dc9ae41298abf859d5b312fba40359c691d9b14527375f4633cbe65", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-x86_64.exe" + "sha256": "a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "76ad1680eb8c8bb1236243f56fc8c693e377408603bbbc5511d2d491aea2971b", - "url": "https://github.com/docker/compose/releases/download/v2.15.1/docker-compose-windows-aarch64.exe" + "sha256": "3be36960ef77ad89008bfd6b6e23cac6d7b803f34f03951949b7d773921f1b0e", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.15.1" + "version": "2.16.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 6b3d48a87bee74f096bd28a23385972994a4f313 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 8 Feb 2023 16:02:11 -0800 Subject: [PATCH 150/667] Adjust DOCKER_TLS_CERTDIR behavior to allow providing server certs without CA This is the way to specify "I want TLS configured, but I'm managing the certs myself" The only thing we'll do is verify that the `cert.pem` is legit with respect to the `ca.pem` and then we'll let Docker itself provide any relevant errors beyond that. --- 20.10/dind/dockerd-entrypoint.sh | 9 ++++++--- 23.0/dind/dockerd-entrypoint.sh | 9 ++++++--- dockerd-entrypoint.sh | 9 ++++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/20.10/dind/dockerd-entrypoint.sh b/20.10/dind/dockerd-entrypoint.sh index caf382300..ccce03839 100755 --- a/20.10/dind/dockerd-entrypoint.sh +++ b/20.10/dind/dockerd-entrypoint.sh @@ -21,11 +21,17 @@ _tls_san() { _tls_generate_certs() { local dir="$1"; shift + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) # if ca/key.pem || !ca/cert.pem, generate CA public if necessary # if ca/key.pem, generate server public # if ca/key.pem, generate client public # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + # https://github.com/FiloSottile/mkcert/issues/174 local certValidDays='825' @@ -110,9 +116,6 @@ if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then # add our default arguments if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then _tls_generate_certs "$DOCKER_TLS_CERTDIR" - [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] - [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] - [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] # generate certs and use TLS if requested/possible (default in 19.03+) set -- dockerd \ --host="$dockerSocket" \ diff --git a/23.0/dind/dockerd-entrypoint.sh b/23.0/dind/dockerd-entrypoint.sh index caf382300..ccce03839 100755 --- a/23.0/dind/dockerd-entrypoint.sh +++ b/23.0/dind/dockerd-entrypoint.sh @@ -21,11 +21,17 @@ _tls_san() { _tls_generate_certs() { local dir="$1"; shift + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) # if ca/key.pem || !ca/cert.pem, generate CA public if necessary # if ca/key.pem, generate server public # if ca/key.pem, generate client public # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + # https://github.com/FiloSottile/mkcert/issues/174 local certValidDays='825' @@ -110,9 +116,6 @@ if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then # add our default arguments if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then _tls_generate_certs "$DOCKER_TLS_CERTDIR" - [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] - [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] - [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] # generate certs and use TLS if requested/possible (default in 19.03+) set -- dockerd \ --host="$dockerSocket" \ diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index caf382300..ccce03839 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -21,11 +21,17 @@ _tls_san() { _tls_generate_certs() { local dir="$1"; shift + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) # if ca/key.pem || !ca/cert.pem, generate CA public if necessary # if ca/key.pem, generate server public # if ca/key.pem, generate client public # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + # https://github.com/FiloSottile/mkcert/issues/174 local certValidDays='825' @@ -110,9 +116,6 @@ if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then # add our default arguments if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then _tls_generate_certs "$DOCKER_TLS_CERTDIR" - [ -s "$DOCKER_TLS_CERTDIR/server/ca.pem" ] - [ -s "$DOCKER_TLS_CERTDIR/server/cert.pem" ] - [ -s "$DOCKER_TLS_CERTDIR/server/key.pem" ] # generate certs and use TLS if requested/possible (default in 19.03+) set -- dockerd \ --host="$dockerSocket" \ From 9a3b24b5b115d368c1aecf92dfadacc7cf49da12 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 9 Feb 2023 16:04:28 -0800 Subject: [PATCH 151/667] Update 23.0 to 23.0.1 --- 23.0/cli/Dockerfile | 10 +++++----- 23.0/dind-rootless/Dockerfile | 4 ++-- 23.0/dind/Dockerfile | 8 ++++---- 23.0/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index 71182efcb..793a99df9 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -19,23 +19,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.0 +ENV DOCKER_VERSION 23.0.1 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.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/dind-rootless/Dockerfile b/23.0/dind-rootless/Dockerfile index 2520ce2ca..6aa43fdbc 100644 --- a/23.0/dind-rootless/Dockerfile +++ b/23.0/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.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/dind/Dockerfile b/23.0/dind/Dockerfile index 1038929c1..ef365f34e 100644 --- a/23.0/dind/Dockerfile +++ b/23.0/dind/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.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index ea31faf03..f01b49345 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/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.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.0.zip +ENV DOCKER_VERSION 23.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.1.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/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index c5f803d4d..ca471e10c 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/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.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.0.zip +ENV DOCKER_VERSION 23.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.1.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/versions.json b/versions.json index 6e808635a..2ff4e504b 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "23.0": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.1.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "23.0.0" + "version": "23.0.1" }, "23.0-rc": null } From 94129ecd12de7acbc9d5a15d25d535ee091770b1 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 10 Feb 2023 10:33:32 -0800 Subject: [PATCH 152/667] Fix TLS typo, again, with vigor --- 20.10/dind/dockerd-entrypoint.sh | 2 +- 23.0/dind/dockerd-entrypoint.sh | 2 +- dockerd-entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/20.10/dind/dockerd-entrypoint.sh b/20.10/dind/dockerd-entrypoint.sh index ccce03839..0dd29c19b 100755 --- a/20.10/dind/dockerd-entrypoint.sh +++ b/20.10/dind/dockerd-entrypoint.sh @@ -27,7 +27,7 @@ _tls_generate_certs() { # if ca/key.pem, generate client public # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! "$dir/ca/key.pem" ]; then + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" return 0 fi diff --git a/23.0/dind/dockerd-entrypoint.sh b/23.0/dind/dockerd-entrypoint.sh index ccce03839..0dd29c19b 100755 --- a/23.0/dind/dockerd-entrypoint.sh +++ b/23.0/dind/dockerd-entrypoint.sh @@ -27,7 +27,7 @@ _tls_generate_certs() { # if ca/key.pem, generate client public # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! "$dir/ca/key.pem" ]; then + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" return 0 fi diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index ccce03839..0dd29c19b 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -27,7 +27,7 @@ _tls_generate_certs() { # if ca/key.pem, generate client public # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! "$dir/ca/key.pem" ]; then + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" return 0 fi From 8a0590b0033d0922237ea0937a0ed4b112e01b29 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Feb 2023 10:04:16 -0800 Subject: [PATCH 153/667] Update 20.10 to buildx 0.10.3 --- 20.10/cli/Dockerfile | 30 ++++++++++++------------ versions.json | 56 ++++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index dbde134c2..d5d8a98ce 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.2 +ENV DOCKER_BUILDX_VERSION 0.10.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64'; \ - sha256='ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-amd64'; \ + sha256='91f260c9879f8dc8b78912409f8d9f16a3429d457dbcfa0a67169f74837a9290'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6'; \ - sha256='4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v6'; \ + sha256='1555a3605ae261cad6e64ace62cd3f5e026cee71fca30a3d9d00dd74b90c8662'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7'; \ - sha256='d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v7'; \ + sha256='07eb9c583f40cb3e3943a228acd05b01245c5b1f45e1ede95b10a1e7ac45b54c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64'; \ - sha256='5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm64'; \ + sha256='d37e6824d06bcaaf8bbedb2a802d3b0b9a551aa956a22f52dbcfeba65fe8e427'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le'; \ - sha256='fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-ppc64le'; \ + sha256='bc9109501600f12db826ad587d4f342cb9b64e80fdad5b69fac0f75758a912d3'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64'; \ - sha256='b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-riscv64'; \ + sha256='ef3a7acfb3d991af6a2f846c37b9b02974fd94be1441bb90a7619978467f20cb'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x'; \ - sha256='9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-s390x'; \ + sha256='f743330936b355d2780996f7f0fce296aa4c09fdbdef38775d09c78ca7726e40'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 2ff4e504b..213713778 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.2.linux-amd64", - "sha256": "ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64" + "file": "buildx-v0.10.3.linux-amd64", + "sha256": "91f260c9879f8dc8b78912409f8d9f16a3429d457dbcfa0a67169f74837a9290", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.2.linux-arm-v6", - "sha256": "4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6" + "file": "buildx-v0.10.3.linux-arm-v6", + "sha256": "1555a3605ae261cad6e64ace62cd3f5e026cee71fca30a3d9d00dd74b90c8662", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.2.linux-arm-v7", - "sha256": "d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7" + "file": "buildx-v0.10.3.linux-arm-v7", + "sha256": "07eb9c583f40cb3e3943a228acd05b01245c5b1f45e1ede95b10a1e7ac45b54c", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.2.linux-arm64", - "sha256": "5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64" + "file": "buildx-v0.10.3.linux-arm64", + "sha256": "d37e6824d06bcaaf8bbedb2a802d3b0b9a551aa956a22f52dbcfeba65fe8e427", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.2.linux-ppc64le", - "sha256": "fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le" + "file": "buildx-v0.10.3.linux-ppc64le", + "sha256": "bc9109501600f12db826ad587d4f342cb9b64e80fdad5b69fac0f75758a912d3", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.2.linux-riscv64", - "sha256": "b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64" + "file": "buildx-v0.10.3.linux-riscv64", + "sha256": "ef3a7acfb3d991af6a2f846c37b9b02974fd94be1441bb90a7619978467f20cb", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.2.linux-s390x", - "sha256": "9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x" + "file": "buildx-v0.10.3.linux-s390x", + "sha256": "f743330936b355d2780996f7f0fce296aa4c09fdbdef38775d09c78ca7726e40", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.2.windows-amd64.exe", - "sha256": "04e869c832c966b07b4418921549fc5d97fe90218d83a1be28304c3e33dd4660", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.exe" + "file": "buildx-v0.10.3.windows-amd64.exe", + "sha256": "a45edb76405922fdcd1373f04d15684389a44f3c145ca597ae07ebb5694a67e0", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.2.windows-arm64.exe", - "sha256": "a4bd81ddb5506ef096a134f48b608c9b89297a9d2d72f6c695adcece84c28a4d", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.exe" + "file": "buildx-v0.10.3.windows-arm64.exe", + "sha256": "94775c1121b37cf8577ea4bd4d0c8edc4be39bfae722398cf2344013239aa2c7", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.windows-arm64.exe" } }, - "version": "0.10.2" + "version": "0.10.3" }, "compose": { "arches": { From 50d102385f2d5198a043317f63abb8ac7f9347c9 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Feb 2023 10:06:51 -0800 Subject: [PATCH 154/667] Update 23.0 to buildx 0.10.3 --- 23.0/cli/Dockerfile | 30 ++++++++++++------------ versions.json | 56 ++++++++++++++++++++++----------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index 793a99df9..72ce54208 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.2 +ENV DOCKER_BUILDX_VERSION 0.10.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64'; \ - sha256='ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-amd64'; \ + sha256='91f260c9879f8dc8b78912409f8d9f16a3429d457dbcfa0a67169f74837a9290'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6'; \ - sha256='4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v6'; \ + sha256='1555a3605ae261cad6e64ace62cd3f5e026cee71fca30a3d9d00dd74b90c8662'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7'; \ - sha256='d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v7'; \ + sha256='07eb9c583f40cb3e3943a228acd05b01245c5b1f45e1ede95b10a1e7ac45b54c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64'; \ - sha256='5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm64'; \ + sha256='d37e6824d06bcaaf8bbedb2a802d3b0b9a551aa956a22f52dbcfeba65fe8e427'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le'; \ - sha256='fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-ppc64le'; \ + sha256='bc9109501600f12db826ad587d4f342cb9b64e80fdad5b69fac0f75758a912d3'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64'; \ - sha256='b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-riscv64'; \ + sha256='ef3a7acfb3d991af6a2f846c37b9b02974fd94be1441bb90a7619978467f20cb'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x'; \ - sha256='9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-s390x'; \ + sha256='f743330936b355d2780996f7f0fce296aa4c09fdbdef38775d09c78ca7726e40'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 213713778..4d2f70617 100644 --- a/versions.json +++ b/versions.json @@ -164,52 +164,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.2.linux-amd64", - "sha256": "ee5a5e3ebf5e5c73ac840993720bd1e72c4beb3b4ee9e85e2d6b4364cac87d89", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-amd64" + "file": "buildx-v0.10.3.linux-amd64", + "sha256": "91f260c9879f8dc8b78912409f8d9f16a3429d457dbcfa0a67169f74837a9290", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.2.linux-arm-v6", - "sha256": "4d7c2e9eaed303306b40e0505577f4c7088c99f048a5870dd133cb7ad2336bd6", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v6" + "file": "buildx-v0.10.3.linux-arm-v6", + "sha256": "1555a3605ae261cad6e64ace62cd3f5e026cee71fca30a3d9d00dd74b90c8662", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.2.linux-arm-v7", - "sha256": "d74936a4e4e9266aeca66e6a545ed99d83753b4901e0f5210e7646c987591974", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm-v7" + "file": "buildx-v0.10.3.linux-arm-v7", + "sha256": "07eb9c583f40cb3e3943a228acd05b01245c5b1f45e1ede95b10a1e7ac45b54c", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.2.linux-arm64", - "sha256": "5f6c706833221cd2cae267ac8612c1809f9d7e8f3fe87707ae86cb695c560cd9", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-arm64" + "file": "buildx-v0.10.3.linux-arm64", + "sha256": "d37e6824d06bcaaf8bbedb2a802d3b0b9a551aa956a22f52dbcfeba65fe8e427", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.2.linux-ppc64le", - "sha256": "fe55ae43e009b4523523575f500257d7dafeb0aa637392b1853676b8a7a55b7b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-ppc64le" + "file": "buildx-v0.10.3.linux-ppc64le", + "sha256": "bc9109501600f12db826ad587d4f342cb9b64e80fdad5b69fac0f75758a912d3", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.2.linux-riscv64", - "sha256": "b57cd352329baebca4cc8102806927de3f5402fff16f6f6e4a2e48080434472b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-riscv64" + "file": "buildx-v0.10.3.linux-riscv64", + "sha256": "ef3a7acfb3d991af6a2f846c37b9b02974fd94be1441bb90a7619978467f20cb", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.2.linux-s390x", - "sha256": "9a3be43a3a6902617a8224b41177a840e1a638597a27d7b7c2d558adb8be3a24", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.linux-s390x" + "file": "buildx-v0.10.3.linux-s390x", + "sha256": "f743330936b355d2780996f7f0fce296aa4c09fdbdef38775d09c78ca7726e40", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.2.windows-amd64.exe", - "sha256": "04e869c832c966b07b4418921549fc5d97fe90218d83a1be28304c3e33dd4660", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-amd64.exe" + "file": "buildx-v0.10.3.windows-amd64.exe", + "sha256": "a45edb76405922fdcd1373f04d15684389a44f3c145ca597ae07ebb5694a67e0", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.2.windows-arm64.exe", - "sha256": "a4bd81ddb5506ef096a134f48b608c9b89297a9d2d72f6c695adcece84c28a4d", - "url": "https://github.com/docker/buildx/releases/download/v0.10.2/buildx-v0.10.2.windows-arm64.exe" + "file": "buildx-v0.10.3.windows-arm64.exe", + "sha256": "94775c1121b37cf8577ea4bd4d0c8edc4be39bfae722398cf2344013239aa2c7", + "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.windows-arm64.exe" } }, - "version": "0.10.2" + "version": "0.10.3" }, "compose": { "arches": { From 2b9081b30eb448cf292cb074eeded4389b1f0011 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 27 Feb 2023 16:07:26 -0800 Subject: [PATCH 155/667] Update 20.10 to compose 2.17.0-rc.1 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index d5d8a98ce..361025da7 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.16.0 +ENV DOCKER_COMPOSE_VERSION 2.17.0-rc.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64'; \ - sha256='54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-x86_64'; \ + sha256='6646b4d6531d825591f5bd27f612ce4d262e200f129961f67fb5bedcabba73a9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6'; \ - sha256='59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv6'; \ + sha256='0b1619d5dc0db2e513205c902bacca04ea59ef5c0f87fed7a447ac341f4d29b6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7'; \ - sha256='558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv7'; \ + sha256='1fd5c8d98839c617573deb6985c675375e996ab5d2309b94b1a0a1e560f91e8f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64'; \ - sha256='edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-aarch64'; \ + sha256='61c91980eec8d321e07ed570a2214b0d23c47293c6649f998a29f627d8c77260'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le'; \ - sha256='aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-ppc64le'; \ + sha256='a4a6e22742908f5751391bc3b372fe0d13f6d500acf80877fa079e38d18a24c8'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64'; \ - sha256='8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-riscv64'; \ + sha256='69835bf55a78b82e0a999773aa8bf17d1fe7f958b6f30036c38908e43abb25e6'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x'; \ - sha256='fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-s390x'; \ + sha256='2ebfd3edf65a54a2618134b751309dc5e0bd681c3821c8c04abff43c1867d344'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 4d2f70617..d6341bb04 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64" + "sha256": "6646b4d6531d825591f5bd27f612ce4d262e200f129961f67fb5bedcabba73a9", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6" + "sha256": "0b1619d5dc0db2e513205c902bacca04ea59ef5c0f87fed7a447ac341f4d29b6", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7" + "sha256": "1fd5c8d98839c617573deb6985c675375e996ab5d2309b94b1a0a1e560f91e8f", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64" + "sha256": "61c91980eec8d321e07ed570a2214b0d23c47293c6649f998a29f627d8c77260", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "2bf40f35b107551486dc46c5c0dcd0027dfadd8f129cccc37a034848ef2288b9", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-x86_64" + "sha256": "eac6ae873dcbbb734c3318a61aa6080405cbe35b67810b10ea457d27843730bd", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "975dfb3860e6777b9b383a1eb1f5cdbc5c3aba085149a8c9efbe74d9c50740d1", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-aarch64" + "sha256": "610aed58839118ef6cc8cbe1f865e89cb65d9999a9b67be8065d4c005a5689fa", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le" + "sha256": "a4a6e22742908f5751391bc3b372fe0d13f6d500acf80877fa079e38d18a24c8", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64" + "sha256": "69835bf55a78b82e0a999773aa8bf17d1fe7f958b6f30036c38908e43abb25e6", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x" + "sha256": "2ebfd3edf65a54a2618134b751309dc5e0bd681c3821c8c04abff43c1867d344", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe" + "sha256": "9e20945b56b9889d2a2d26be78c5c512b238f467a9ff5625008148968b6b5c2a", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "3be36960ef77ad89008bfd6b6e23cac6d7b803f34f03951949b7d773921f1b0e", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-aarch64.exe" + "sha256": "f29c8afe52d1ba2196dfdb13d7a0c4706bb2a296841c8969aee7abc6b684cecd", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.16.0" + "version": "2.17.0-rc.1" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 96fd3733ebe215c279cb917db649d1914da0c1fb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 27 Feb 2023 16:09:59 -0800 Subject: [PATCH 156/667] Update 23.0 to compose 2.17.0-rc.1 --- 23.0/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index 72ce54208..cf212bea9 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.16.0 +ENV DOCKER_COMPOSE_VERSION 2.17.0-rc.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64'; \ - sha256='54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-x86_64'; \ + sha256='6646b4d6531d825591f5bd27f612ce4d262e200f129961f67fb5bedcabba73a9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6'; \ - sha256='59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv6'; \ + sha256='0b1619d5dc0db2e513205c902bacca04ea59ef5c0f87fed7a447ac341f4d29b6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7'; \ - sha256='558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv7'; \ + sha256='1fd5c8d98839c617573deb6985c675375e996ab5d2309b94b1a0a1e560f91e8f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64'; \ - sha256='edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-aarch64'; \ + sha256='61c91980eec8d321e07ed570a2214b0d23c47293c6649f998a29f627d8c77260'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le'; \ - sha256='aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-ppc64le'; \ + sha256='a4a6e22742908f5751391bc3b372fe0d13f6d500acf80877fa079e38d18a24c8'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64'; \ - sha256='8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-riscv64'; \ + sha256='69835bf55a78b82e0a999773aa8bf17d1fe7f958b6f30036c38908e43abb25e6'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x'; \ - sha256='fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-s390x'; \ + sha256='2ebfd3edf65a54a2618134b751309dc5e0bd681c3821c8c04abff43c1867d344'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index d6341bb04..1d17c1f42 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64" + "sha256": "6646b4d6531d825591f5bd27f612ce4d262e200f129961f67fb5bedcabba73a9", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6" + "sha256": "0b1619d5dc0db2e513205c902bacca04ea59ef5c0f87fed7a447ac341f4d29b6", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7" + "sha256": "1fd5c8d98839c617573deb6985c675375e996ab5d2309b94b1a0a1e560f91e8f", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64" + "sha256": "61c91980eec8d321e07ed570a2214b0d23c47293c6649f998a29f627d8c77260", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "2bf40f35b107551486dc46c5c0dcd0027dfadd8f129cccc37a034848ef2288b9", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-x86_64" + "sha256": "eac6ae873dcbbb734c3318a61aa6080405cbe35b67810b10ea457d27843730bd", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "975dfb3860e6777b9b383a1eb1f5cdbc5c3aba085149a8c9efbe74d9c50740d1", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-aarch64" + "sha256": "610aed58839118ef6cc8cbe1f865e89cb65d9999a9b67be8065d4c005a5689fa", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le" + "sha256": "a4a6e22742908f5751391bc3b372fe0d13f6d500acf80877fa079e38d18a24c8", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64" + "sha256": "69835bf55a78b82e0a999773aa8bf17d1fe7f958b6f30036c38908e43abb25e6", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x" + "sha256": "2ebfd3edf65a54a2618134b751309dc5e0bd681c3821c8c04abff43c1867d344", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe" + "sha256": "9e20945b56b9889d2a2d26be78c5c512b238f467a9ff5625008148968b6b5c2a", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "3be36960ef77ad89008bfd6b6e23cac6d7b803f34f03951949b7d773921f1b0e", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-aarch64.exe" + "sha256": "f29c8afe52d1ba2196dfdb13d7a0c4706bb2a296841c8969aee7abc6b684cecd", + "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.16.0" + "version": "2.17.0-rc.1" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 9bb3dd2ee9fb1c75c8aff6b3d36700169a56f674 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 28 Feb 2023 15:15:58 -0800 Subject: [PATCH 157/667] Skip compose RCs --- versions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.sh b/versions.sh index 0aea8c536..1bd5aa35a 100755 --- a/versions.sh +++ b/versions.sh @@ -119,6 +119,7 @@ composeVersions="$( | cut -d$'\t' -f2 \ | grep '^refs/tags/v[0-9].*$' \ | sed 's!^refs/tags/v!!; s!\^{}$!!' \ + | grep -vE -- '-rc' \ | sort -ruV )" compose= From 66615574bcb165c4104fc25780953d1067742652 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 28 Feb 2023 15:23:42 -0800 Subject: [PATCH 158/667] Update 20.10 to compose 2.16.0 --- 20.10/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 361025da7..d5d8a98ce 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.17.0-rc.1 +ENV DOCKER_COMPOSE_VERSION 2.16.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-x86_64'; \ - sha256='6646b4d6531d825591f5bd27f612ce4d262e200f129961f67fb5bedcabba73a9'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64'; \ + sha256='54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv6'; \ - sha256='0b1619d5dc0db2e513205c902bacca04ea59ef5c0f87fed7a447ac341f4d29b6'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6'; \ + sha256='59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv7'; \ - sha256='1fd5c8d98839c617573deb6985c675375e996ab5d2309b94b1a0a1e560f91e8f'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7'; \ + sha256='558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-aarch64'; \ - sha256='61c91980eec8d321e07ed570a2214b0d23c47293c6649f998a29f627d8c77260'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64'; \ + sha256='edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-ppc64le'; \ - sha256='a4a6e22742908f5751391bc3b372fe0d13f6d500acf80877fa079e38d18a24c8'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le'; \ + sha256='aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-riscv64'; \ - sha256='69835bf55a78b82e0a999773aa8bf17d1fe7f958b6f30036c38908e43abb25e6'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64'; \ + sha256='8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-s390x'; \ - sha256='2ebfd3edf65a54a2618134b751309dc5e0bd681c3821c8c04abff43c1867d344'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x'; \ + sha256='fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 1d17c1f42..5fb3379e3 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6646b4d6531d825591f5bd27f612ce4d262e200f129961f67fb5bedcabba73a9", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-x86_64" + "sha256": "54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "0b1619d5dc0db2e513205c902bacca04ea59ef5c0f87fed7a447ac341f4d29b6", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv6" + "sha256": "59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "1fd5c8d98839c617573deb6985c675375e996ab5d2309b94b1a0a1e560f91e8f", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv7" + "sha256": "558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "61c91980eec8d321e07ed570a2214b0d23c47293c6649f998a29f627d8c77260", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-aarch64" + "sha256": "edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "eac6ae873dcbbb734c3318a61aa6080405cbe35b67810b10ea457d27843730bd", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-darwin-x86_64" + "sha256": "2bf40f35b107551486dc46c5c0dcd0027dfadd8f129cccc37a034848ef2288b9", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "610aed58839118ef6cc8cbe1f865e89cb65d9999a9b67be8065d4c005a5689fa", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-darwin-aarch64" + "sha256": "975dfb3860e6777b9b383a1eb1f5cdbc5c3aba085149a8c9efbe74d9c50740d1", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "a4a6e22742908f5751391bc3b372fe0d13f6d500acf80877fa079e38d18a24c8", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-ppc64le" + "sha256": "aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "69835bf55a78b82e0a999773aa8bf17d1fe7f958b6f30036c38908e43abb25e6", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-riscv64" + "sha256": "8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2ebfd3edf65a54a2618134b751309dc5e0bd681c3821c8c04abff43c1867d344", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-s390x" + "sha256": "fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "9e20945b56b9889d2a2d26be78c5c512b238f467a9ff5625008148968b6b5c2a", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-windows-x86_64.exe" + "sha256": "a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "f29c8afe52d1ba2196dfdb13d7a0c4706bb2a296841c8969aee7abc6b684cecd", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-windows-aarch64.exe" + "sha256": "3be36960ef77ad89008bfd6b6e23cac6d7b803f34f03951949b7d773921f1b0e", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.17.0-rc.1" + "version": "2.16.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 5ca2408cbe1d40aa0c990a183712e8757ddf561d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 28 Feb 2023 15:37:42 -0800 Subject: [PATCH 159/667] Update 23.0 to compose 2.16.0 --- 23.0/cli/Dockerfile | 30 ++++++++++++++--------------- versions.json | 46 ++++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index cf212bea9..72ce54208 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.17.0-rc.1 +ENV DOCKER_COMPOSE_VERSION 2.16.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-x86_64'; \ - sha256='6646b4d6531d825591f5bd27f612ce4d262e200f129961f67fb5bedcabba73a9'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64'; \ + sha256='54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv6'; \ - sha256='0b1619d5dc0db2e513205c902bacca04ea59ef5c0f87fed7a447ac341f4d29b6'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6'; \ + sha256='59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv7'; \ - sha256='1fd5c8d98839c617573deb6985c675375e996ab5d2309b94b1a0a1e560f91e8f'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7'; \ + sha256='558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-aarch64'; \ - sha256='61c91980eec8d321e07ed570a2214b0d23c47293c6649f998a29f627d8c77260'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64'; \ + sha256='edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-ppc64le'; \ - sha256='a4a6e22742908f5751391bc3b372fe0d13f6d500acf80877fa079e38d18a24c8'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le'; \ + sha256='aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-riscv64'; \ - sha256='69835bf55a78b82e0a999773aa8bf17d1fe7f958b6f30036c38908e43abb25e6'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64'; \ + sha256='8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-s390x'; \ - sha256='2ebfd3edf65a54a2618134b751309dc5e0bd681c3821c8c04abff43c1867d344'; \ + url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x'; \ + sha256='fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 5fb3379e3..4d2f70617 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6646b4d6531d825591f5bd27f612ce4d262e200f129961f67fb5bedcabba73a9", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-x86_64" + "sha256": "54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "0b1619d5dc0db2e513205c902bacca04ea59ef5c0f87fed7a447ac341f4d29b6", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv6" + "sha256": "59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "1fd5c8d98839c617573deb6985c675375e996ab5d2309b94b1a0a1e560f91e8f", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-armv7" + "sha256": "558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "61c91980eec8d321e07ed570a2214b0d23c47293c6649f998a29f627d8c77260", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-aarch64" + "sha256": "edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "eac6ae873dcbbb734c3318a61aa6080405cbe35b67810b10ea457d27843730bd", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-darwin-x86_64" + "sha256": "2bf40f35b107551486dc46c5c0dcd0027dfadd8f129cccc37a034848ef2288b9", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "610aed58839118ef6cc8cbe1f865e89cb65d9999a9b67be8065d4c005a5689fa", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-darwin-aarch64" + "sha256": "975dfb3860e6777b9b383a1eb1f5cdbc5c3aba085149a8c9efbe74d9c50740d1", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "a4a6e22742908f5751391bc3b372fe0d13f6d500acf80877fa079e38d18a24c8", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-ppc64le" + "sha256": "aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "69835bf55a78b82e0a999773aa8bf17d1fe7f958b6f30036c38908e43abb25e6", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-riscv64" + "sha256": "8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2ebfd3edf65a54a2618134b751309dc5e0bd681c3821c8c04abff43c1867d344", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-linux-s390x" + "sha256": "fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "9e20945b56b9889d2a2d26be78c5c512b238f467a9ff5625008148968b6b5c2a", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-windows-x86_64.exe" + "sha256": "a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "f29c8afe52d1ba2196dfdb13d7a0c4706bb2a296841c8969aee7abc6b684cecd", - "url": "https://github.com/docker/compose/releases/download/v2.17.0-rc.1/docker-compose-windows-aarch64.exe" + "sha256": "3be36960ef77ad89008bfd6b6e23cac6d7b803f34f03951949b7d773921f1b0e", + "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.17.0-rc.1" + "version": "2.16.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 01e35e23b4169fb959e6dd72dd1b84404cf6b6a5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 1 Mar 2023 04:04:15 -0800 Subject: [PATCH 160/667] Update 20.10 --- 20.10/cli/Dockerfile | 3 --- 20.10/dind-rootless/Dockerfile | 3 --- 20.10/dind/Dockerfile | 3 --- versions.json | 4 ---- 4 files changed, 13 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index d5d8a98ce..4ad907c75 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -25,9 +25,6 @@ RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz'; \ - ;; \ 'armhf') \ url='https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz'; \ ;; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 63fdcf5ac..6ee90e6b1 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -23,9 +23,6 @@ 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-20.10.23.tgz'; \ - ;; \ 'aarch64') \ url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.23.tgz'; \ ;; \ diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index 10503c8c7..dc6be7e93 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/Dockerfile @@ -41,9 +41,6 @@ RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz'; \ - ;; \ 'armhf') \ url='https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz'; \ ;; \ diff --git a/versions.json b/versions.json index 4d2f70617..36da2dc74 100644 --- a/versions.json +++ b/versions.json @@ -1,10 +1,6 @@ { "20.10": { "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.23.tgz" - }, "arm32v6": { "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz" }, From 289f581eae49901789a416fee2ede9a6950e7629 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 1 Mar 2023 09:20:19 -0800 Subject: [PATCH 161/667] Add back amd64 and make sure we don't lose it again --- 20.10/cli/Dockerfile | 3 +++ 20.10/dind-rootless/Dockerfile | 3 +++ 20.10/dind/Dockerfile | 3 +++ versions.json | 4 ++++ versions.sh | 14 +++++++++++--- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 4ad907c75..d5d8a98ce 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -25,6 +25,9 @@ RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz'; \ + ;; \ 'armhf') \ url='https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz'; \ ;; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 6ee90e6b1..63fdcf5ac 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/dind-rootless/Dockerfile @@ -23,6 +23,9 @@ 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-20.10.23.tgz'; \ + ;; \ 'aarch64') \ url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.23.tgz'; \ ;; \ diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index dc6be7e93..10503c8c7 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/Dockerfile @@ -41,6 +41,9 @@ RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz'; \ + ;; \ 'armhf') \ url='https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz'; \ ;; \ diff --git a/versions.json b/versions.json index 36da2dc74..4d2f70617 100644 --- a/versions.json +++ b/versions.json @@ -1,6 +1,10 @@ { "20.10": { "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.23.tgz" + }, "arm32v6": { "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz" }, diff --git a/versions.sh b/versions.sh index 1bd5aa35a..44274cd57 100755 --- a/versions.sh +++ b/versions.sh @@ -213,7 +213,7 @@ for version in "${versions[@]}"; do }' )" - hasWindows= + declare -A hasArches=() for bashbrewArch in "${!dockerArches[@]}"; do arch="${dockerArches[$bashbrewArch]}" # check whether the given architecture is supported for this release @@ -232,8 +232,9 @@ for version in "${versions[@]}"; do continue fi + hasArches["$bashbrewArch"]=1 + if [ -n "$windows" ]; then - hasWindows=1 continue # Windows doesn't have rootless extras :) fi @@ -252,6 +253,13 @@ for version in "${versions[@]}"; do esac done + for alwaysExpectedArch in amd64 arm64v8; do + if [ -z "${hasArches["$alwaysExpectedArch"]:-}" ]; then + echo >&2 "error: missing '$alwaysExpectedArch' for '$version'; cowardly refusing to continue! (because this is almost always a scraping flake or similar bug)" + exit 1 + fi + done + # order here controls the order of the library/ file for variant in \ cli \ @@ -262,7 +270,7 @@ for version in "${versions[@]}"; do windows/windowsservercore-1809 \ ; do base="${variant%%/*}" # "buster", "windows", etc. - if [ "$base" = 'windows' ] && [ -z "$hasWindows" ]; then + if [ "$base" = 'windows' ] && [ -z "${hasArches['windows-amd64']}" ]; then continue fi export variant From 36100cd12d15c411b097727a2a84a09c656d2d24 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 6 Mar 2023 16:04:15 -0800 Subject: [PATCH 162/667] Update 20.10 to buildx 0.10.4 --- 20.10/cli/Dockerfile | 30 ++++++++++++------------ versions.json | 56 ++++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index d5d8a98ce..f67eb6bf9 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.3 +ENV DOCKER_BUILDX_VERSION 0.10.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-amd64'; \ - sha256='91f260c9879f8dc8b78912409f8d9f16a3429d457dbcfa0a67169f74837a9290'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64'; \ + sha256='dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v6'; \ - sha256='1555a3605ae261cad6e64ace62cd3f5e026cee71fca30a3d9d00dd74b90c8662'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6'; \ + sha256='d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v7'; \ - sha256='07eb9c583f40cb3e3943a228acd05b01245c5b1f45e1ede95b10a1e7ac45b54c'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7'; \ + sha256='aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm64'; \ - sha256='d37e6824d06bcaaf8bbedb2a802d3b0b9a551aa956a22f52dbcfeba65fe8e427'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64'; \ + sha256='e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-ppc64le'; \ - sha256='bc9109501600f12db826ad587d4f342cb9b64e80fdad5b69fac0f75758a912d3'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le'; \ + sha256='d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-riscv64'; \ - sha256='ef3a7acfb3d991af6a2f846c37b9b02974fd94be1441bb90a7619978467f20cb'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64'; \ + sha256='393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-s390x'; \ - sha256='f743330936b355d2780996f7f0fce296aa4c09fdbdef38775d09c78ca7726e40'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x'; \ + sha256='16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 4d2f70617..6a655ee66 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.3.linux-amd64", - "sha256": "91f260c9879f8dc8b78912409f8d9f16a3429d457dbcfa0a67169f74837a9290", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-amd64" + "file": "buildx-v0.10.4.linux-amd64", + "sha256": "dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.3.linux-arm-v6", - "sha256": "1555a3605ae261cad6e64ace62cd3f5e026cee71fca30a3d9d00dd74b90c8662", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v6" + "file": "buildx-v0.10.4.linux-arm-v6", + "sha256": "d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.3.linux-arm-v7", - "sha256": "07eb9c583f40cb3e3943a228acd05b01245c5b1f45e1ede95b10a1e7ac45b54c", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v7" + "file": "buildx-v0.10.4.linux-arm-v7", + "sha256": "aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.3.linux-arm64", - "sha256": "d37e6824d06bcaaf8bbedb2a802d3b0b9a551aa956a22f52dbcfeba65fe8e427", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm64" + "file": "buildx-v0.10.4.linux-arm64", + "sha256": "e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.3.linux-ppc64le", - "sha256": "bc9109501600f12db826ad587d4f342cb9b64e80fdad5b69fac0f75758a912d3", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-ppc64le" + "file": "buildx-v0.10.4.linux-ppc64le", + "sha256": "d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.3.linux-riscv64", - "sha256": "ef3a7acfb3d991af6a2f846c37b9b02974fd94be1441bb90a7619978467f20cb", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-riscv64" + "file": "buildx-v0.10.4.linux-riscv64", + "sha256": "393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.3.linux-s390x", - "sha256": "f743330936b355d2780996f7f0fce296aa4c09fdbdef38775d09c78ca7726e40", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-s390x" + "file": "buildx-v0.10.4.linux-s390x", + "sha256": "16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.3.windows-amd64.exe", - "sha256": "a45edb76405922fdcd1373f04d15684389a44f3c145ca597ae07ebb5694a67e0", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.windows-amd64.exe" + "file": "buildx-v0.10.4.windows-amd64.exe", + "sha256": "e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.3.windows-arm64.exe", - "sha256": "94775c1121b37cf8577ea4bd4d0c8edc4be39bfae722398cf2344013239aa2c7", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.windows-arm64.exe" + "file": "buildx-v0.10.4.windows-arm64.exe", + "sha256": "06349dd5c193732a8b04488ee056de95caf6fa30b3d4efdbf663cdb9090353f2", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-arm64.exe" } }, - "version": "0.10.3" + "version": "0.10.4" }, "compose": { "arches": { From 06e0b8a8b836ee66175685592bcadfe149c92896 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 6 Mar 2023 16:06:27 -0800 Subject: [PATCH 163/667] Update 23.0 to buildx 0.10.4 --- 23.0/cli/Dockerfile | 30 ++++++++++++------------ versions.json | 56 ++++++++++++++++++++++----------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index 72ce54208..4b2f4ef79 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -53,38 +53,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.3 +ENV DOCKER_BUILDX_VERSION 0.10.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-amd64'; \ - sha256='91f260c9879f8dc8b78912409f8d9f16a3429d457dbcfa0a67169f74837a9290'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64'; \ + sha256='dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v6'; \ - sha256='1555a3605ae261cad6e64ace62cd3f5e026cee71fca30a3d9d00dd74b90c8662'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6'; \ + sha256='d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v7'; \ - sha256='07eb9c583f40cb3e3943a228acd05b01245c5b1f45e1ede95b10a1e7ac45b54c'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7'; \ + sha256='aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm64'; \ - sha256='d37e6824d06bcaaf8bbedb2a802d3b0b9a551aa956a22f52dbcfeba65fe8e427'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64'; \ + sha256='e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-ppc64le'; \ - sha256='bc9109501600f12db826ad587d4f342cb9b64e80fdad5b69fac0f75758a912d3'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le'; \ + sha256='d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-riscv64'; \ - sha256='ef3a7acfb3d991af6a2f846c37b9b02974fd94be1441bb90a7619978467f20cb'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64'; \ + sha256='393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-s390x'; \ - sha256='f743330936b355d2780996f7f0fce296aa4c09fdbdef38775d09c78ca7726e40'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x'; \ + sha256='16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/versions.json b/versions.json index 6a655ee66..9e00d87b4 100644 --- a/versions.json +++ b/versions.json @@ -164,52 +164,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.3.linux-amd64", - "sha256": "91f260c9879f8dc8b78912409f8d9f16a3429d457dbcfa0a67169f74837a9290", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-amd64" + "file": "buildx-v0.10.4.linux-amd64", + "sha256": "dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.3.linux-arm-v6", - "sha256": "1555a3605ae261cad6e64ace62cd3f5e026cee71fca30a3d9d00dd74b90c8662", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v6" + "file": "buildx-v0.10.4.linux-arm-v6", + "sha256": "d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.3.linux-arm-v7", - "sha256": "07eb9c583f40cb3e3943a228acd05b01245c5b1f45e1ede95b10a1e7ac45b54c", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm-v7" + "file": "buildx-v0.10.4.linux-arm-v7", + "sha256": "aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.3.linux-arm64", - "sha256": "d37e6824d06bcaaf8bbedb2a802d3b0b9a551aa956a22f52dbcfeba65fe8e427", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-arm64" + "file": "buildx-v0.10.4.linux-arm64", + "sha256": "e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.3.linux-ppc64le", - "sha256": "bc9109501600f12db826ad587d4f342cb9b64e80fdad5b69fac0f75758a912d3", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-ppc64le" + "file": "buildx-v0.10.4.linux-ppc64le", + "sha256": "d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.3.linux-riscv64", - "sha256": "ef3a7acfb3d991af6a2f846c37b9b02974fd94be1441bb90a7619978467f20cb", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-riscv64" + "file": "buildx-v0.10.4.linux-riscv64", + "sha256": "393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.3.linux-s390x", - "sha256": "f743330936b355d2780996f7f0fce296aa4c09fdbdef38775d09c78ca7726e40", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.linux-s390x" + "file": "buildx-v0.10.4.linux-s390x", + "sha256": "16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.3.windows-amd64.exe", - "sha256": "a45edb76405922fdcd1373f04d15684389a44f3c145ca597ae07ebb5694a67e0", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.windows-amd64.exe" + "file": "buildx-v0.10.4.windows-amd64.exe", + "sha256": "e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.3.windows-arm64.exe", - "sha256": "94775c1121b37cf8577ea4bd4d0c8edc4be39bfae722398cf2344013239aa2c7", - "url": "https://github.com/docker/buildx/releases/download/v0.10.3/buildx-v0.10.3.windows-arm64.exe" + "file": "buildx-v0.10.4.windows-arm64.exe", + "sha256": "06349dd5c193732a8b04488ee056de95caf6fa30b3d4efdbf663cdb9090353f2", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-arm64.exe" } }, - "version": "0.10.3" + "version": "0.10.4" }, "compose": { "arches": { From 1497727a0ec70e78a78563f365c76a21749ac27a Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 9 Mar 2023 14:11:41 -0800 Subject: [PATCH 164/667] Add "compose" and "buildx" CLI plugins to Windows CLI-only container --- .../windows/windowsservercore-1809/Dockerfile | 51 +++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 51 +++++++++++++++++++ .../windows/windowsservercore-1809/Dockerfile | 51 +++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 51 +++++++++++++++++++ Dockerfile-windows-servercore.template | 45 ++++++++++++++++ apply-templates.sh | 2 + 6 files changed, 251 insertions(+) diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index ffbc5e692..6655ea6d6 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/windowsservercore-1809/Dockerfile @@ -38,3 +38,54 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ docker --version; \ \ Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.10.4 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.16.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index 9a8a6a064..aeeec6263 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/windowsservercore-ltsc2022/Dockerfile @@ -38,3 +38,54 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ docker --version; \ \ Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.10.4 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.16.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index f01b49345..93b40b471 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/windowsservercore-1809/Dockerfile @@ -38,3 +38,54 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ docker --version; \ \ Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.10.4 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.16.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index ca471e10c..3ddadbce0 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/windowsservercore-ltsc2022/Dockerfile @@ -38,3 +38,54 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ docker --version; \ \ Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.10.4 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.16.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/Dockerfile-windows-servercore.template b/Dockerfile-windows-servercore.template index 8b1f2628c..b607c222b 100644 --- a/Dockerfile-windows-servercore.template +++ b/Dockerfile-windows-servercore.template @@ -32,3 +32,48 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ docker --version; \ \ Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +{{ + { + buildx: .buildx, + compose: .compose, + } + | to_entries | map( + .key as $key | ($key | ascii_upcase) as $KEY | .value | ( +-}} +ENV DOCKER_{{ $KEY }}_VERSION {{ .version }} +ENV DOCKER_{{ $KEY }}_URL {{ .arches["windows-amd64"].url }} +ENV DOCKER_{{ $KEY }}_SHA256 {{ .arches["windows-amd64"].sha256 }} +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-{{ $key }}.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_{{ $KEY }}_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_{{ $KEY }}_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_{{ $KEY }}_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_{{ $KEY }}_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker {{ $key }} version") ...'; \ + docker {{ $key }} version; \ +{{ if $key == "compose" then ( -}} + \ + $link = ('{0}\docker\docker-{{ $key }}.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-{{ $key }} --version") ...'; \ + docker-{{ $key }} --version; \ +{{ ) else "" end -}} + \ + Write-Host 'Complete.'; +{{ + ) + ) + | add +-}} diff --git a/apply-templates.sh b/apply-templates.sh index 706c4adec..f11612fb5 100755 --- a/apply-templates.sh +++ b/apply-templates.sh @@ -59,6 +59,8 @@ for version; do ;; esac + echo "processing $dir ..." + mkdir -p "$dir" { generated_warning From 2efbb5c7c69a0104f0c965e7cc7b33658fdf9602 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 13 Mar 2023 12:29:10 -0700 Subject: [PATCH 165/667] Ditch libc6-compat in 23+ --- 20.10/cli/Dockerfile | 2 +- 23.0/cli/Dockerfile | 2 -- Dockerfile-cli.template | 4 +++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index f67eb6bf9..f20f26b1c 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -8,7 +8,7 @@ FROM alpine:3.17 RUN apk add --no-cache \ ca-certificates \ -# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 +# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824, https://github.com/docker-library/docker/issues/377 libc6-compat \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index 4b2f4ef79..17a15866c 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -8,8 +8,6 @@ FROM alpine:3.17 RUN apk add --no-cache \ ca-certificates \ -# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 - libc6-compat \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index f44a9d231..915fa51b8 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -3,8 +3,10 @@ FROM alpine:3.17 RUN apk add --no-cache \ ca-certificates \ -# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824 +{{ if env.version | rtrimstr("-rc") == "20.10" then ( -}} +# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824, https://github.com/docker-library/docker/issues/377 libc6-compat \ +{{ ) else "" end -}} # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client From 3315a0f42f915e906ba57e8d3788b5a646c2c5fd Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 20 Mar 2023 14:00:54 -0700 Subject: [PATCH 166/667] Opt into buildkit-based builds --- generate-stackbrew-library.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a54c64643..40c7055dc 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -95,6 +95,7 @@ cat <<-EOH Maintainers: Tianon Gravi (@tianon), Joseph Ferguson (@yosifkit) GitRepo: https://github.com/docker-library/docker.git +Builder: buildkit EOH # prints "$2$1$3$1...$N" @@ -204,6 +205,9 @@ for version; do GitCommit: $commit Directory: $dir EOE - [ "$variant" = "$v" ] || echo "Constraints: $variant" + if [ "$variant" != "$v" ]; then + echo "Constraints: $variant" + echo 'Builder: classic' # no Windows support in BuildKit (yet) + fi done done From b52b53bd52b7237db7e2d549ea4026329a623987 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 Mar 2023 10:04:12 -0700 Subject: [PATCH 167/667] Update 20.10 to compose 2.17.0 --- 20.10/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index f20f26b1c..27c455cdf 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.16.0 +ENV DOCKER_COMPOSE_VERSION 2.17.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64'; \ - sha256='54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-x86_64'; \ + sha256='65edee934d988471c40ef31305731dbb4381d3cb0aeea13342119b61772f85e2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6'; \ - sha256='59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv6'; \ + sha256='9c663260e38ad4931a124876ba174bc229c82f7b140ce1d29ca89274b927b3d2'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7'; \ - sha256='558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv7'; \ + sha256='4aa5f20a4568abc1c1eec1ea80e3c7dfbd514dcb5002ba2add780cc3bb940b6f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64'; \ - sha256='edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-aarch64'; \ + sha256='bae865468e47d7032d91e5daf7868c3a8cc1e83fb36db9dfd98c4cc9fbf7c6e9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le'; \ - sha256='aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-ppc64le'; \ + sha256='b9369b23ef55443bbebc71a2617735f672e91881324bf524090b465028dd9ac8'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64'; \ - sha256='8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-riscv64'; \ + sha256='24e5b85733083b5480f924b23b7602e32b2826d83377922bdf7cc92973fa1969'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x'; \ - sha256='fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-s390x'; \ + sha256='98df65213044aaf3a933e582b5183e1b57ff6a7519ac8487133690950b26846e'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 6655ea6d6..4de3aa5b0 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.16.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c +ENV DOCKER_COMPOSE_VERSION 2.17.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index aeeec6263..55c6ecc75 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.16.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c +ENV DOCKER_COMPOSE_VERSION 2.17.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 9e00d87b4..4f27402c7 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64" + "sha256": "65edee934d988471c40ef31305731dbb4381d3cb0aeea13342119b61772f85e2", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6" + "sha256": "9c663260e38ad4931a124876ba174bc229c82f7b140ce1d29ca89274b927b3d2", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7" + "sha256": "4aa5f20a4568abc1c1eec1ea80e3c7dfbd514dcb5002ba2add780cc3bb940b6f", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64" + "sha256": "bae865468e47d7032d91e5daf7868c3a8cc1e83fb36db9dfd98c4cc9fbf7c6e9", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "2bf40f35b107551486dc46c5c0dcd0027dfadd8f129cccc37a034848ef2288b9", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-x86_64" + "sha256": "6a29a49fcadfeacce259d52f309462d1998358cfbb5b0e7322dfe411e1110989", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "975dfb3860e6777b9b383a1eb1f5cdbc5c3aba085149a8c9efbe74d9c50740d1", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-aarch64" + "sha256": "4b649809def813eafba8c9ab52968c66991345cef0e5f30e0d967859e9cf3e1a", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le" + "sha256": "b9369b23ef55443bbebc71a2617735f672e91881324bf524090b465028dd9ac8", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64" + "sha256": "24e5b85733083b5480f924b23b7602e32b2826d83377922bdf7cc92973fa1969", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x" + "sha256": "98df65213044aaf3a933e582b5183e1b57ff6a7519ac8487133690950b26846e", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe" + "sha256": "1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "3be36960ef77ad89008bfd6b6e23cac6d7b803f34f03951949b7d773921f1b0e", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-aarch64.exe" + "sha256": "474a04cb4d1450e63023ffa5325f33ec89ce400749fe220d0cf09049a48e601e", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.16.0" + "version": "2.17.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From fab79131966992c026631b6699f7131e175a8a75 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 Mar 2023 10:05:51 -0700 Subject: [PATCH 168/667] Update 23.0 to compose 2.17.0 --- 23.0/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index 17a15866c..7da599025 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.16.0 +ENV DOCKER_COMPOSE_VERSION 2.17.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64'; \ - sha256='54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-x86_64'; \ + sha256='65edee934d988471c40ef31305731dbb4381d3cb0aeea13342119b61772f85e2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6'; \ - sha256='59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv6'; \ + sha256='9c663260e38ad4931a124876ba174bc229c82f7b140ce1d29ca89274b927b3d2'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7'; \ - sha256='558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv7'; \ + sha256='4aa5f20a4568abc1c1eec1ea80e3c7dfbd514dcb5002ba2add780cc3bb940b6f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64'; \ - sha256='edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-aarch64'; \ + sha256='bae865468e47d7032d91e5daf7868c3a8cc1e83fb36db9dfd98c4cc9fbf7c6e9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le'; \ - sha256='aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-ppc64le'; \ + sha256='b9369b23ef55443bbebc71a2617735f672e91881324bf524090b465028dd9ac8'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64'; \ - sha256='8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-riscv64'; \ + sha256='24e5b85733083b5480f924b23b7602e32b2826d83377922bdf7cc92973fa1969'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x'; \ - sha256='fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8'; \ + url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-s390x'; \ + sha256='98df65213044aaf3a933e582b5183e1b57ff6a7519ac8487133690950b26846e'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index 93b40b471..004c19523 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.16.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c +ENV DOCKER_COMPOSE_VERSION 2.17.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index 3ddadbce0..4ece32e2c 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.16.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c +ENV DOCKER_COMPOSE_VERSION 2.17.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 4f27402c7..05591b3b5 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "54ab01967b05e392e6bf13afbc654146890b9fa40501b40aca83a2db18f10427", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64" + "sha256": "65edee934d988471c40ef31305731dbb4381d3cb0aeea13342119b61772f85e2", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "59caa4c31a6515a81b44446d978891c5e1d0f460b9b11e38dea27e1bffdb4cd6", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv6" + "sha256": "9c663260e38ad4931a124876ba174bc229c82f7b140ce1d29ca89274b927b3d2", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "558a083683bd597f5e167178dbdbe57824eecf2132bfb497a58f5d39c5e49e8a", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-armv7" + "sha256": "4aa5f20a4568abc1c1eec1ea80e3c7dfbd514dcb5002ba2add780cc3bb940b6f", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "edaf196a0b9ebe749aa1a42a6ce4550d2c6c2620762aa98c36088a9b96fd22ef", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-aarch64" + "sha256": "bae865468e47d7032d91e5daf7868c3a8cc1e83fb36db9dfd98c4cc9fbf7c6e9", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "2bf40f35b107551486dc46c5c0dcd0027dfadd8f129cccc37a034848ef2288b9", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-x86_64" + "sha256": "6a29a49fcadfeacce259d52f309462d1998358cfbb5b0e7322dfe411e1110989", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "975dfb3860e6777b9b383a1eb1f5cdbc5c3aba085149a8c9efbe74d9c50740d1", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-darwin-aarch64" + "sha256": "4b649809def813eafba8c9ab52968c66991345cef0e5f30e0d967859e9cf3e1a", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "aac719dc81ef117bdcca96d7e43ecd605ebcdc1df77c0b09b9d5faf15ccf952e", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-ppc64le" + "sha256": "b9369b23ef55443bbebc71a2617735f672e91881324bf524090b465028dd9ac8", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "8c485ee45cf6be4d483179e925ffeb3b046280d1be045cdfc999c0a011ddfcd1", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-riscv64" + "sha256": "24e5b85733083b5480f924b23b7602e32b2826d83377922bdf7cc92973fa1969", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "fbaff480bd7901c31ead046652c3f5a3c1236766ce9f52fadfa935a18dd463b8", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-s390x" + "sha256": "98df65213044aaf3a933e582b5183e1b57ff6a7519ac8487133690950b26846e", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "a35d1188e796dbda914ddb9677059c654b445aa2921066e0b556ca9906bb603c", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-x86_64.exe" + "sha256": "1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "3be36960ef77ad89008bfd6b6e23cac6d7b803f34f03951949b7d773921f1b0e", - "url": "https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-windows-aarch64.exe" + "sha256": "474a04cb4d1450e63023ffa5325f33ec89ce400749fe220d0cf09049a48e601e", + "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.16.0" + "version": "2.17.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 975f21072b43c18c18ee415cc526b07c20a2345b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 24 Mar 2023 16:04:12 -0700 Subject: [PATCH 169/667] Update 20.10 to compose 2.17.1 --- 20.10/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 27c455cdf..aedc1469b 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.17.0 +ENV DOCKER_COMPOSE_VERSION 2.17.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-x86_64'; \ - sha256='65edee934d988471c40ef31305731dbb4381d3cb0aeea13342119b61772f85e2'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-x86_64'; \ + sha256='4d1a46d6ffbf610b289f1871c6c5d41c733fa615a2ac75567cd9e521c8ddcbf6'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv6'; \ - sha256='9c663260e38ad4931a124876ba174bc229c82f7b140ce1d29ca89274b927b3d2'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv6'; \ + sha256='bdfc3173ce946274962c43bae0f4c3f13133b40323aa56c437b5d6f0027a667a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv7'; \ - sha256='4aa5f20a4568abc1c1eec1ea80e3c7dfbd514dcb5002ba2add780cc3bb940b6f'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv7'; \ + sha256='af89be829e860108ee157dfcc3ff1cc3e11a37a4f24184321b4febc476427cf7'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-aarch64'; \ - sha256='bae865468e47d7032d91e5daf7868c3a8cc1e83fb36db9dfd98c4cc9fbf7c6e9'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-aarch64'; \ + sha256='62bd252be8096dd33562ec8f1ba408dc43cbb3a23d0fd1a83a20334ef9f4d3d9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-ppc64le'; \ - sha256='b9369b23ef55443bbebc71a2617735f672e91881324bf524090b465028dd9ac8'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-ppc64le'; \ + sha256='92cf59049a7ddf767108985f0d775977a1e246c620c70f63659fe768c71dd48a'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-riscv64'; \ - sha256='24e5b85733083b5480f924b23b7602e32b2826d83377922bdf7cc92973fa1969'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-riscv64'; \ + sha256='27bc0a039f6610f95ca6d977571d149b7623ed626f6aef6a06c46e449af1da21'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-s390x'; \ - sha256='98df65213044aaf3a933e582b5183e1b57ff6a7519ac8487133690950b26846e'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-s390x'; \ + sha256='c235800575e07309b4f55c6734a2236453bfef29dc84474ec1a8ad119e41bccb'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 4de3aa5b0..dce37e564 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8 +ENV DOCKER_COMPOSE_VERSION 2.17.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index 55c6ecc75..14278fdfe 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8 +ENV DOCKER_COMPOSE_VERSION 2.17.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 05591b3b5..b967cb29b 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "65edee934d988471c40ef31305731dbb4381d3cb0aeea13342119b61772f85e2", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-x86_64" + "sha256": "4d1a46d6ffbf610b289f1871c6c5d41c733fa615a2ac75567cd9e521c8ddcbf6", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "9c663260e38ad4931a124876ba174bc229c82f7b140ce1d29ca89274b927b3d2", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv6" + "sha256": "bdfc3173ce946274962c43bae0f4c3f13133b40323aa56c437b5d6f0027a667a", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4aa5f20a4568abc1c1eec1ea80e3c7dfbd514dcb5002ba2add780cc3bb940b6f", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv7" + "sha256": "af89be829e860108ee157dfcc3ff1cc3e11a37a4f24184321b4febc476427cf7", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "bae865468e47d7032d91e5daf7868c3a8cc1e83fb36db9dfd98c4cc9fbf7c6e9", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-aarch64" + "sha256": "62bd252be8096dd33562ec8f1ba408dc43cbb3a23d0fd1a83a20334ef9f4d3d9", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "6a29a49fcadfeacce259d52f309462d1998358cfbb5b0e7322dfe411e1110989", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-darwin-x86_64" + "sha256": "11ff6ff20930a88ca521585ed739da9964252929d7e22b4f2a450c816c3a97c6", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "4b649809def813eafba8c9ab52968c66991345cef0e5f30e0d967859e9cf3e1a", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-darwin-aarch64" + "sha256": "2b58fdadfdc85836dc680ea58339202bcb4859524cb31f31ef728ca49a832827", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "b9369b23ef55443bbebc71a2617735f672e91881324bf524090b465028dd9ac8", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-ppc64le" + "sha256": "92cf59049a7ddf767108985f0d775977a1e246c620c70f63659fe768c71dd48a", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "24e5b85733083b5480f924b23b7602e32b2826d83377922bdf7cc92973fa1969", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-riscv64" + "sha256": "27bc0a039f6610f95ca6d977571d149b7623ed626f6aef6a06c46e449af1da21", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "98df65213044aaf3a933e582b5183e1b57ff6a7519ac8487133690950b26846e", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-s390x" + "sha256": "c235800575e07309b4f55c6734a2236453bfef29dc84474ec1a8ad119e41bccb", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe" + "sha256": "e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "474a04cb4d1450e63023ffa5325f33ec89ce400749fe220d0cf09049a48e601e", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-aarch64.exe" + "sha256": "b517485d3a79faa313fa2054e7bd8f92ae2a8b40172664ba6282fdd3e1177060", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.17.0" + "version": "2.17.1" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From ddb6d22efec332c38ecc4c7af2e4006f5c36e067 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 24 Mar 2023 16:05:49 -0700 Subject: [PATCH 170/667] Update 23.0 to compose 2.17.1 --- 23.0/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index 7da599025..b9dd49113 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.17.0 +ENV DOCKER_COMPOSE_VERSION 2.17.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-x86_64'; \ - sha256='65edee934d988471c40ef31305731dbb4381d3cb0aeea13342119b61772f85e2'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-x86_64'; \ + sha256='4d1a46d6ffbf610b289f1871c6c5d41c733fa615a2ac75567cd9e521c8ddcbf6'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv6'; \ - sha256='9c663260e38ad4931a124876ba174bc229c82f7b140ce1d29ca89274b927b3d2'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv6'; \ + sha256='bdfc3173ce946274962c43bae0f4c3f13133b40323aa56c437b5d6f0027a667a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv7'; \ - sha256='4aa5f20a4568abc1c1eec1ea80e3c7dfbd514dcb5002ba2add780cc3bb940b6f'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv7'; \ + sha256='af89be829e860108ee157dfcc3ff1cc3e11a37a4f24184321b4febc476427cf7'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-aarch64'; \ - sha256='bae865468e47d7032d91e5daf7868c3a8cc1e83fb36db9dfd98c4cc9fbf7c6e9'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-aarch64'; \ + sha256='62bd252be8096dd33562ec8f1ba408dc43cbb3a23d0fd1a83a20334ef9f4d3d9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-ppc64le'; \ - sha256='b9369b23ef55443bbebc71a2617735f672e91881324bf524090b465028dd9ac8'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-ppc64le'; \ + sha256='92cf59049a7ddf767108985f0d775977a1e246c620c70f63659fe768c71dd48a'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-riscv64'; \ - sha256='24e5b85733083b5480f924b23b7602e32b2826d83377922bdf7cc92973fa1969'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-riscv64'; \ + sha256='27bc0a039f6610f95ca6d977571d149b7623ed626f6aef6a06c46e449af1da21'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-s390x'; \ - sha256='98df65213044aaf3a933e582b5183e1b57ff6a7519ac8487133690950b26846e'; \ + url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-s390x'; \ + sha256='c235800575e07309b4f55c6734a2236453bfef29dc84474ec1a8ad119e41bccb'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index 004c19523..be5650262 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8 +ENV DOCKER_COMPOSE_VERSION 2.17.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index 4ece32e2c..f919017f0 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8 +ENV DOCKER_COMPOSE_VERSION 2.17.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b967cb29b..9b6f6ebb0 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "65edee934d988471c40ef31305731dbb4381d3cb0aeea13342119b61772f85e2", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-x86_64" + "sha256": "4d1a46d6ffbf610b289f1871c6c5d41c733fa615a2ac75567cd9e521c8ddcbf6", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "9c663260e38ad4931a124876ba174bc229c82f7b140ce1d29ca89274b927b3d2", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv6" + "sha256": "bdfc3173ce946274962c43bae0f4c3f13133b40323aa56c437b5d6f0027a667a", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4aa5f20a4568abc1c1eec1ea80e3c7dfbd514dcb5002ba2add780cc3bb940b6f", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-armv7" + "sha256": "af89be829e860108ee157dfcc3ff1cc3e11a37a4f24184321b4febc476427cf7", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "bae865468e47d7032d91e5daf7868c3a8cc1e83fb36db9dfd98c4cc9fbf7c6e9", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-aarch64" + "sha256": "62bd252be8096dd33562ec8f1ba408dc43cbb3a23d0fd1a83a20334ef9f4d3d9", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "6a29a49fcadfeacce259d52f309462d1998358cfbb5b0e7322dfe411e1110989", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-darwin-x86_64" + "sha256": "11ff6ff20930a88ca521585ed739da9964252929d7e22b4f2a450c816c3a97c6", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "4b649809def813eafba8c9ab52968c66991345cef0e5f30e0d967859e9cf3e1a", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-darwin-aarch64" + "sha256": "2b58fdadfdc85836dc680ea58339202bcb4859524cb31f31ef728ca49a832827", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "b9369b23ef55443bbebc71a2617735f672e91881324bf524090b465028dd9ac8", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-ppc64le" + "sha256": "92cf59049a7ddf767108985f0d775977a1e246c620c70f63659fe768c71dd48a", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "24e5b85733083b5480f924b23b7602e32b2826d83377922bdf7cc92973fa1969", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-riscv64" + "sha256": "27bc0a039f6610f95ca6d977571d149b7623ed626f6aef6a06c46e449af1da21", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "98df65213044aaf3a933e582b5183e1b57ff6a7519ac8487133690950b26846e", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-linux-s390x" + "sha256": "c235800575e07309b4f55c6734a2236453bfef29dc84474ec1a8ad119e41bccb", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "1374f42a72ac46430b4a72016d8b1428317dd81811016373518b7afa7d86cee8", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-x86_64.exe" + "sha256": "e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "474a04cb4d1450e63023ffa5325f33ec89ce400749fe220d0cf09049a48e601e", - "url": "https://github.com/docker/compose/releases/download/v2.17.0/docker-compose-windows-aarch64.exe" + "sha256": "b517485d3a79faa313fa2054e7bd8f92ae2a8b40172664ba6282fdd3e1177060", + "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.17.0" + "version": "2.17.1" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 124e0288010e8b2774e56e58202a3941ac0234ff Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 26 Mar 2023 10:04:12 -0700 Subject: [PATCH 171/667] Update 20.10 to compose 2.17.2 --- 20.10/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index aedc1469b..e75333059 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.17.1 +ENV DOCKER_COMPOSE_VERSION 2.17.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-x86_64'; \ - sha256='4d1a46d6ffbf610b289f1871c6c5d41c733fa615a2ac75567cd9e521c8ddcbf6'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64'; \ + sha256='895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv6'; \ - sha256='bdfc3173ce946274962c43bae0f4c3f13133b40323aa56c437b5d6f0027a667a'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6'; \ + sha256='16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv7'; \ - sha256='af89be829e860108ee157dfcc3ff1cc3e11a37a4f24184321b4febc476427cf7'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7'; \ + sha256='4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-aarch64'; \ - sha256='62bd252be8096dd33562ec8f1ba408dc43cbb3a23d0fd1a83a20334ef9f4d3d9'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64'; \ + sha256='fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-ppc64le'; \ - sha256='92cf59049a7ddf767108985f0d775977a1e246c620c70f63659fe768c71dd48a'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le'; \ + sha256='546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-riscv64'; \ - sha256='27bc0a039f6610f95ca6d977571d149b7623ed626f6aef6a06c46e449af1da21'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64'; \ + sha256='65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-s390x'; \ - sha256='c235800575e07309b4f55c6734a2236453bfef29dc84474ec1a8ad119e41bccb'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x'; \ + sha256='4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index dce37e564..7bebe9bab 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d +ENV DOCKER_COMPOSE_VERSION 2.17.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index 14278fdfe..9b8bb4afd 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d +ENV DOCKER_COMPOSE_VERSION 2.17.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 9b6f6ebb0..e1cc38d7b 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "4d1a46d6ffbf610b289f1871c6c5d41c733fa615a2ac75567cd9e521c8ddcbf6", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-x86_64" + "sha256": "895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "bdfc3173ce946274962c43bae0f4c3f13133b40323aa56c437b5d6f0027a667a", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv6" + "sha256": "16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "af89be829e860108ee157dfcc3ff1cc3e11a37a4f24184321b4febc476427cf7", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv7" + "sha256": "4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "62bd252be8096dd33562ec8f1ba408dc43cbb3a23d0fd1a83a20334ef9f4d3d9", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-aarch64" + "sha256": "fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "11ff6ff20930a88ca521585ed739da9964252929d7e22b4f2a450c816c3a97c6", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-darwin-x86_64" + "sha256": "4af67af4e63d9e47b7495be2a38cfb97f1f3f13dd11a304d32933564d2d6fbca", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "2b58fdadfdc85836dc680ea58339202bcb4859524cb31f31ef728ca49a832827", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-darwin-aarch64" + "sha256": "8cc28c1d9b6ef9cc3d4ec5bfe0a1e9125795dfe4f7875f52e086c780e9fc8f2d", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "92cf59049a7ddf767108985f0d775977a1e246c620c70f63659fe768c71dd48a", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-ppc64le" + "sha256": "546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "27bc0a039f6610f95ca6d977571d149b7623ed626f6aef6a06c46e449af1da21", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-riscv64" + "sha256": "65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "c235800575e07309b4f55c6734a2236453bfef29dc84474ec1a8ad119e41bccb", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-s390x" + "sha256": "4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe" + "sha256": "0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "b517485d3a79faa313fa2054e7bd8f92ae2a8b40172664ba6282fdd3e1177060", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-aarch64.exe" + "sha256": "0d35207b27522202d9b74173700c2e20dc61ce3df970a05c4367e27d8dead29c", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.17.1" + "version": "2.17.2" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 561e8f7f0ace0ef7cf85d24ec50c77865c397109 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sun, 26 Mar 2023 10:05:49 -0700 Subject: [PATCH 172/667] Update 23.0 to compose 2.17.2 --- 23.0/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index b9dd49113..ead5294fa 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.17.1 +ENV DOCKER_COMPOSE_VERSION 2.17.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-x86_64'; \ - sha256='4d1a46d6ffbf610b289f1871c6c5d41c733fa615a2ac75567cd9e521c8ddcbf6'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64'; \ + sha256='895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv6'; \ - sha256='bdfc3173ce946274962c43bae0f4c3f13133b40323aa56c437b5d6f0027a667a'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6'; \ + sha256='16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv7'; \ - sha256='af89be829e860108ee157dfcc3ff1cc3e11a37a4f24184321b4febc476427cf7'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7'; \ + sha256='4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-aarch64'; \ - sha256='62bd252be8096dd33562ec8f1ba408dc43cbb3a23d0fd1a83a20334ef9f4d3d9'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64'; \ + sha256='fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-ppc64le'; \ - sha256='92cf59049a7ddf767108985f0d775977a1e246c620c70f63659fe768c71dd48a'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le'; \ + sha256='546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-riscv64'; \ - sha256='27bc0a039f6610f95ca6d977571d149b7623ed626f6aef6a06c46e449af1da21'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64'; \ + sha256='65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-s390x'; \ - sha256='c235800575e07309b4f55c6734a2236453bfef29dc84474ec1a8ad119e41bccb'; \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x'; \ + sha256='4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index be5650262..294903edc 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d +ENV DOCKER_COMPOSE_VERSION 2.17.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index f919017f0..16a335a86 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d +ENV DOCKER_COMPOSE_VERSION 2.17.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index e1cc38d7b..a68f6c2ec 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "4d1a46d6ffbf610b289f1871c6c5d41c733fa615a2ac75567cd9e521c8ddcbf6", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-x86_64" + "sha256": "895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "bdfc3173ce946274962c43bae0f4c3f13133b40323aa56c437b5d6f0027a667a", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv6" + "sha256": "16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "af89be829e860108ee157dfcc3ff1cc3e11a37a4f24184321b4febc476427cf7", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-armv7" + "sha256": "4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "62bd252be8096dd33562ec8f1ba408dc43cbb3a23d0fd1a83a20334ef9f4d3d9", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-aarch64" + "sha256": "fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "11ff6ff20930a88ca521585ed739da9964252929d7e22b4f2a450c816c3a97c6", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-darwin-x86_64" + "sha256": "4af67af4e63d9e47b7495be2a38cfb97f1f3f13dd11a304d32933564d2d6fbca", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "2b58fdadfdc85836dc680ea58339202bcb4859524cb31f31ef728ca49a832827", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-darwin-aarch64" + "sha256": "8cc28c1d9b6ef9cc3d4ec5bfe0a1e9125795dfe4f7875f52e086c780e9fc8f2d", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "92cf59049a7ddf767108985f0d775977a1e246c620c70f63659fe768c71dd48a", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-ppc64le" + "sha256": "546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "27bc0a039f6610f95ca6d977571d149b7623ed626f6aef6a06c46e449af1da21", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-riscv64" + "sha256": "65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "c235800575e07309b4f55c6734a2236453bfef29dc84474ec1a8ad119e41bccb", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-linux-s390x" + "sha256": "4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e4c2e730993a369d295d3940388c99888318d3c5fdeca11ade5bde6e0827504d", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-x86_64.exe" + "sha256": "0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "b517485d3a79faa313fa2054e7bd8f92ae2a8b40172664ba6282fdd3e1177060", - "url": "https://github.com/docker/compose/releases/download/v2.17.1/docker-compose-windows-aarch64.exe" + "sha256": "0d35207b27522202d9b74173700c2e20dc61ce3df970a05c4367e27d8dead29c", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.17.1" + "version": "2.17.2" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 47f0e5da49022e03f76c1bcaf911f640996d8288 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 28 Mar 2023 10:04:23 -0700 Subject: [PATCH 173/667] Update 23.0 to 23.0.2 --- 23.0/cli/Dockerfile | 10 +++++----- 23.0/dind-rootless/Dockerfile | 4 ++-- 23.0/dind/Dockerfile | 8 ++++---- 23.0/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index ead5294fa..a69ee2c38 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/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.1 +ENV DOCKER_VERSION 23.0.2 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.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/dind-rootless/Dockerfile b/23.0/dind-rootless/Dockerfile index 6aa43fdbc..6244b04ef 100644 --- a/23.0/dind-rootless/Dockerfile +++ b/23.0/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.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/dind/Dockerfile b/23.0/dind/Dockerfile index ef365f34e..ddced96df 100644 --- a/23.0/dind/Dockerfile +++ b/23.0/dind/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.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index 294903edc..3752c8ede 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/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.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.1.zip +ENV DOCKER_VERSION 23.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.2.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/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index 16a335a86..015cf6be1 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/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.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.1.zip +ENV DOCKER_VERSION 23.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.2.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/versions.json b/versions.json index a68f6c2ec..9917ac6e1 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "23.0": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.2.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "23.0.1" + "version": "23.0.2" }, "23.0-rc": null } From 43c75565e6fa4dcf3abadc51cb1c7c044aae1ef2 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 31 Mar 2023 16:55:17 -0700 Subject: [PATCH 174/667] Add 24.0.0-beta.1 --- 24-rc/cli/Dockerfile | 161 ++++++++++++++ 24-rc/cli/docker-entrypoint.sh | 61 ++++++ 24-rc/cli/modprobe.sh | 20 ++ 24-rc/dind-rootless/Dockerfile | 55 +++++ 24-rc/dind/Dockerfile | 89 ++++++++ 24-rc/dind/dockerd-entrypoint.sh | 200 ++++++++++++++++++ 24-rc/git/Dockerfile | 9 + .../windows/windowsservercore-1809/Dockerfile | 91 ++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 ++++++++ versions.json | 144 ++++++++++++- 10 files changed, 920 insertions(+), 1 deletion(-) create mode 100644 24-rc/cli/Dockerfile create mode 100755 24-rc/cli/docker-entrypoint.sh create mode 100755 24-rc/cli/modprobe.sh create mode 100644 24-rc/dind-rootless/Dockerfile create mode 100644 24-rc/dind/Dockerfile create mode 100755 24-rc/dind/dockerd-entrypoint.sh create mode 100644 24-rc/git/Dockerfile create mode 100644 24-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 24-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/24-rc/cli/Dockerfile b/24-rc/cli/Dockerfile new file mode 100644 index 000000000..82e9c3823 --- /dev/null +++ b/24-rc/cli/Dockerfile @@ -0,0 +1,161 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.17 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v20.10.21/hack/make.sh#L115 +# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303 +# - 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 24.0.0-beta.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.10.4 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64'; \ + sha256='dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6'; \ + sha256='d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7'; \ + sha256='aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64'; \ + sha256='e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le'; \ + sha256='d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64'; \ + sha256='393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x'; \ + sha256='16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.17.2 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64'; \ + sha256='895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6'; \ + sha256='16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7'; \ + sha256='4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64'; \ + sha256='fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le'; \ + sha256='546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64'; \ + sha256='65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x'; \ + sha256='4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/24-rc/cli/docker-entrypoint.sh b/24-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/24-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/24-rc/cli/modprobe.sh b/24-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/24-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/24-rc/dind-rootless/Dockerfile b/24-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..a6f45a478 --- /dev/null +++ b/24-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:24-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-beta.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-beta.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/24-rc/dind/Dockerfile b/24-rc/dind/Dockerfile new file mode 100644 index 000000000..aa95e2e87 --- /dev/null +++ b/24-rc/dind/Dockerfile @@ -0,0 +1,89 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:24-rc-cli + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + ip6tables \ + iptables \ + openssl \ + shadow-uidmap \ + xfsprogs \ + xz \ +# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) + pigz \ + ; \ +# only install zfs if it's available for the current architecture +# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) +# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch + if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ + apk add --no-cache zfs; \ + fi + +# TODO aufs-tools + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:24-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 1f32e3c95d72a29b3eaacba156ed675dba976cb5 + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/24-rc/dind/dockerd-entrypoint.sh b/24-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..0dd29c19b --- /dev/null +++ b/24-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,200 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + if dockerd --version | grep -qF ' 20.10.'; then + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + fi + + if ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + modprobe ip_tables || : + fi + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/24-rc/git/Dockerfile b/24-rc/git/Dockerfile new file mode 100644 index 000000000..affa04f89 --- /dev/null +++ b/24-rc/git/Dockerfile @@ -0,0 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:24-rc-cli + +RUN apk add --no-cache git diff --git a/24-rc/windows/windowsservercore-1809/Dockerfile b/24-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..13cac4a4e --- /dev/null +++ b/24-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 24.0.0-beta.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.10.4 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.17.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/24-rc/windows/windowsservercore-ltsc2022/Dockerfile b/24-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..8664e5eff --- /dev/null +++ b/24-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 24.0.0-beta.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.10.4 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.17.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 9917ac6e1..adc05abd1 100644 --- a/versions.json +++ b/versions.json @@ -282,5 +282,147 @@ ], "version": "23.0.2" }, - "23.0-rc": null + "23.0-rc": null, + "24": null, + "24-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-beta.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-beta.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.10.4.linux-amd64", + "sha256": "dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.10.4.linux-arm-v6", + "sha256": "d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.10.4.linux-arm-v7", + "sha256": "aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.10.4.linux-arm64", + "sha256": "e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.10.4.linux-ppc64le", + "sha256": "d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.10.4.linux-riscv64", + "sha256": "393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.10.4.linux-s390x", + "sha256": "16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.10.4.windows-amd64.exe", + "sha256": "e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.10.4.windows-arm64.exe", + "sha256": "06349dd5c193732a8b04488ee056de95caf6fa30b3d4efdbf663cdb9090353f2", + "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-arm64.exe" + } + }, + "version": "0.10.4" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "4af67af4e63d9e47b7495be2a38cfb97f1f3f13dd11a304d32933564d2d6fbca", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "8cc28c1d9b6ef9cc3d4ec5bfe0a1e9125795dfe4f7875f52e086c780e9fc8f2d", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "0d35207b27522202d9b74173700c2e20dc61ce3df970a05c4367e27d8dead29c", + "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.17.2" + }, + "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", + "variants": [ + "cli", + "dind", + "dind-rootless", + "git", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "24.0.0-beta.1" + } } From 0e00a29925ead3f1ba1ccb77895db4963d10ad47 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 3 Apr 2023 14:00:25 -0700 Subject: [PATCH 175/667] Move CLI plugins to "/usr/local/libexec" (as they're not packaging-managed) --- 20.10/cli/Dockerfile | 4 ++-- 23.0/cli/Dockerfile | 4 ++-- 24-rc/cli/Dockerfile | 4 ++-- Dockerfile-cli.template | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index e75333059..6021902bb 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -92,7 +92,7 @@ RUN set -eux; \ wget -O 'docker-buildx' "$url"; \ echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ \ - plugin='/usr/libexec/docker/cli-plugins/docker-buildx'; \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ mkdir -p "$(dirname "$plugin")"; \ mv -vT 'docker-buildx' "$plugin"; \ chmod +x "$plugin"; \ @@ -138,7 +138,7 @@ RUN set -eux; \ wget -O 'docker-compose' "$url"; \ echo "$sha256 *"'docker-compose' | sha256sum -c -; \ \ - plugin='/usr/libexec/docker/cli-plugins/docker-compose'; \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ mkdir -p "$(dirname "$plugin")"; \ mv -vT 'docker-compose' "$plugin"; \ chmod +x "$plugin"; \ diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index a69ee2c38..2565e429a 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -90,7 +90,7 @@ RUN set -eux; \ wget -O 'docker-buildx' "$url"; \ echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ \ - plugin='/usr/libexec/docker/cli-plugins/docker-buildx'; \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ mkdir -p "$(dirname "$plugin")"; \ mv -vT 'docker-buildx' "$plugin"; \ chmod +x "$plugin"; \ @@ -136,7 +136,7 @@ RUN set -eux; \ wget -O 'docker-compose' "$url"; \ echo "$sha256 *"'docker-compose' | sha256sum -c -; \ \ - plugin='/usr/libexec/docker/cli-plugins/docker-compose'; \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ mkdir -p "$(dirname "$plugin")"; \ mv -vT 'docker-compose' "$plugin"; \ chmod +x "$plugin"; \ diff --git a/24-rc/cli/Dockerfile b/24-rc/cli/Dockerfile index 82e9c3823..ecb215c6b 100644 --- a/24-rc/cli/Dockerfile +++ b/24-rc/cli/Dockerfile @@ -90,7 +90,7 @@ RUN set -eux; \ wget -O 'docker-buildx' "$url"; \ echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ \ - plugin='/usr/libexec/docker/cli-plugins/docker-buildx'; \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ mkdir -p "$(dirname "$plugin")"; \ mv -vT 'docker-buildx' "$plugin"; \ chmod +x "$plugin"; \ @@ -136,7 +136,7 @@ RUN set -eux; \ wget -O 'docker-compose' "$url"; \ echo "$sha256 *"'docker-compose' | sha256sum -c -; \ \ - plugin='/usr/libexec/docker/cli-plugins/docker-compose'; \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ mkdir -p "$(dirname "$plugin")"; \ mv -vT 'docker-compose' "$plugin"; \ chmod +x "$plugin"; \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 915fa51b8..a2f3ee7f9 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -61,7 +61,7 @@ RUN set -eux; \ }) }}; \ \ - plugin='/usr/libexec/docker/cli-plugins/docker-{{ $key }}'; \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-{{ $key }}'; \ mkdir -p "$(dirname "$plugin")"; \ mv -vT {{ "docker-" + $key | @sh }} "$plugin"; \ chmod +x "$plugin"; \ From d71ed6659319c2608be2290c581787d2d4779ef2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 4 Apr 2023 14:27:52 -0700 Subject: [PATCH 176/667] Update 20.10 to 20.10.24 --- 20.10/cli/Dockerfile | 10 +++++----- 20.10/dind-rootless/Dockerfile | 4 ++-- 20.10/dind/Dockerfile | 8 ++++---- 20.10/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 6021902bb..9d9cab854 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -19,23 +19,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 20.10.23 +ENV DOCKER_VERSION 20.10.24 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.24.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.24.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.23.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.24.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.23.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.24.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile index 63fdcf5ac..8e60ecbce 100644 --- a/20.10/dind-rootless/Dockerfile +++ b/20.10/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-20.10.23.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.24.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.23.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.24.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile index 10503c8c7..74e1f1b23 100644 --- a/20.10/dind/Dockerfile +++ b/20.10/dind/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-20.10.23.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.24.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-20.10.24.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.23.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.24.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.23.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.24.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index 7bebe9bab..aa7edbfd3 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/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 20.10.23 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.23.zip +ENV DOCKER_VERSION 20.10.24 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.24.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/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index 9b8bb4afd..c5ce06dcc 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/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 20.10.23 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.23.zip +ENV DOCKER_VERSION 20.10.24 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.24.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/versions.json b/versions.json index adc05abd1..fc1faf6f4 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "20.10": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.23.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.24.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.24.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.23.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.24.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.23.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.24.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.23.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.23.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.24.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.24.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.23.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.24.zip" } }, "buildx": { @@ -138,7 +138,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "20.10.23" + "version": "20.10.24" }, "20.10-rc": null, "23.0": { From 3f5aa9dfb44948d1493342e168a1d5d650b45bd7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 4 Apr 2023 17:29:23 -0700 Subject: [PATCH 177/667] Update 23.0 to 23.0.3 --- 23.0/cli/Dockerfile | 10 +++++----- 23.0/dind-rootless/Dockerfile | 4 ++-- 23.0/dind/Dockerfile | 8 ++++---- 23.0/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index 2565e429a..980f524e9 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/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.2 +ENV DOCKER_VERSION 23.0.3 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.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/dind-rootless/Dockerfile b/23.0/dind-rootless/Dockerfile index 6244b04ef..a93f1ed27 100644 --- a/23.0/dind-rootless/Dockerfile +++ b/23.0/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.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/dind/Dockerfile b/23.0/dind/Dockerfile index ddced96df..b36ea2a0d 100644 --- a/23.0/dind/Dockerfile +++ b/23.0/dind/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.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index 3752c8ede..8b7392115 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/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.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.2.zip +ENV DOCKER_VERSION 23.0.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.3.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/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index 015cf6be1..0d582540f 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/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.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.2.zip +ENV DOCKER_VERSION 23.0.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.3.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/versions.json b/versions.json index fc1faf6f4..17ffac618 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "23.0": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.3.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "23.0.2" + "version": "23.0.3" }, "23.0-rc": null, "24": null, From 14430eaf8c84f5ea481b8e481f6222b85709a497 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 14 Apr 2023 10:04:36 -0700 Subject: [PATCH 178/667] Update 24-rc to 24.0.0-beta.2 --- 24-rc/cli/Dockerfile | 10 +++++----- 24-rc/dind-rootless/Dockerfile | 4 ++-- 24-rc/dind/Dockerfile | 8 ++++---- 24-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24-rc/cli/Dockerfile b/24-rc/cli/Dockerfile index ecb215c6b..568482544 100644 --- a/24-rc/cli/Dockerfile +++ b/24-rc/cli/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 24.0.0-beta.1 +ENV DOCKER_VERSION 24.0.0-beta.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/dind-rootless/Dockerfile b/24-rc/dind-rootless/Dockerfile index a6f45a478..540ec7d59 100644 --- a/24-rc/dind-rootless/Dockerfile +++ b/24-rc/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/test/x86_64/docker-rootless-extras-24.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-beta.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-beta.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/dind/Dockerfile b/24-rc/dind/Dockerfile index aa95e2e87..00be095e2 100644 --- a/24-rc/dind/Dockerfile +++ b/24-rc/dind/Dockerfile @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/windows/windowsservercore-1809/Dockerfile b/24-rc/windows/windowsservercore-1809/Dockerfile index 13cac4a4e..9f06a2943 100644 --- a/24-rc/windows/windowsservercore-1809/Dockerfile +++ b/24-rc/windows/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 24.0.0-beta.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.1.zip +ENV DOCKER_VERSION 24.0.0-beta.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.2.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/24-rc/windows/windowsservercore-ltsc2022/Dockerfile b/24-rc/windows/windowsservercore-ltsc2022/Dockerfile index 8664e5eff..5fdd4ed35 100644 --- a/24-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24-rc/windows/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 24.0.0-beta.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.1.zip +ENV DOCKER_VERSION 24.0.0-beta.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.2.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/versions.json b/versions.json index 17ffac618..a53b49140 100644 --- a/versions.json +++ b/versions.json @@ -287,21 +287,21 @@ "24-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-beta.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-beta.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.2.zip" } }, "buildx": { @@ -423,6 +423,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.0-beta.1" + "version": "24.0.0-beta.2" } } From eecbbc8f7b16d13acb17e350df03f435763c3caa Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 17 Apr 2023 16:04:22 -0700 Subject: [PATCH 179/667] Update 23.0 to 23.0.4 --- 23.0/cli/Dockerfile | 10 +++++----- 23.0/dind-rootless/Dockerfile | 4 ++-- 23.0/dind/Dockerfile | 8 ++++---- 23.0/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index 980f524e9..aaa955340 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/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/23.0/dind-rootless/Dockerfile b/23.0/dind-rootless/Dockerfile index a93f1ed27..d60837732 100644 --- a/23.0/dind-rootless/Dockerfile +++ b/23.0/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/23.0/dind/Dockerfile b/23.0/dind/Dockerfile index b36ea2a0d..d9b7a6c01 100644 --- a/23.0/dind/Dockerfile +++ b/23.0/dind/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/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index 8b7392115..2f836ffc2 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/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/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index 0d582540f..418e701ae 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/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) diff --git a/versions.json b/versions.json index a53b49140..adc197503 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "23.0": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.4.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.4.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.4.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.4.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.3.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.4.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "23.0.3" + "version": "23.0.4" }, "23.0-rc": null, "24": null, From 7bdd5e0d531739e1e329c939bd6d24baaffd4570 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 20 Apr 2023 10:04:13 -0700 Subject: [PATCH 180/667] Update 20.10 to compose 2.17.3 --- 20.10/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 9d9cab854..64a22aa38 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -99,38 +99,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.17.2 +ENV DOCKER_COMPOSE_VERSION 2.17.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64'; \ - sha256='895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64'; \ + sha256='6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6'; \ - sha256='16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6'; \ + sha256='e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7'; \ - sha256='4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7'; \ + sha256='72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64'; \ - sha256='fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64'; \ + sha256='07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le'; \ - sha256='546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le'; \ + sha256='06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64'; \ - sha256='65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64'; \ + sha256='51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x'; \ - sha256='4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x'; \ + sha256='666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile index aa7edbfd3..310a28fc7 100644 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ b/20.10/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db +ENV DOCKER_COMPOSE_VERSION 2.17.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile index c5ce06dcc..824b5a6fa 100644 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ b/20.10/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db +ENV DOCKER_COMPOSE_VERSION 2.17.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index adc197503..b0d843a35 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64" + "sha256": "6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6" + "sha256": "e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7" + "sha256": "72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64" + "sha256": "07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "4af67af4e63d9e47b7495be2a38cfb97f1f3f13dd11a304d32933564d2d6fbca", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-x86_64" + "sha256": "291b62b4a86bb2249ed3efe5a1d0a4f610d9cf3abe0f6441f2129bab3538623a", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "8cc28c1d9b6ef9cc3d4ec5bfe0a1e9125795dfe4f7875f52e086c780e9fc8f2d", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-aarch64" + "sha256": "7a59574d0d89fcf26965207819f5ae38ad75db335f9dfd593ff6b39e60231205", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le" + "sha256": "06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64" + "sha256": "51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x" + "sha256": "666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe" + "sha256": "556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "0d35207b27522202d9b74173700c2e20dc61ce3df970a05c4367e27d8dead29c", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-aarch64.exe" + "sha256": "914909bfbac9d13100f51a35ff94138ac418fc3dd79eb1ef0301f064aa7e7816", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.17.2" + "version": "2.17.3" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 3c553b828db84d13fc1b06eaa1d86bd7e7eb060d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 20 Apr 2023 10:06:00 -0700 Subject: [PATCH 181/667] Update 23.0 to compose 2.17.3 --- 23.0/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index aaa955340..cd78216ff 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.17.2 +ENV DOCKER_COMPOSE_VERSION 2.17.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64'; \ - sha256='895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64'; \ + sha256='6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6'; \ - sha256='16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6'; \ + sha256='e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7'; \ - sha256='4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7'; \ + sha256='72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64'; \ - sha256='fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64'; \ + sha256='07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le'; \ - sha256='546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le'; \ + sha256='06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64'; \ - sha256='65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64'; \ + sha256='51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x'; \ - sha256='4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x'; \ + sha256='666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index 2f836ffc2..d509cec9a 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db +ENV DOCKER_COMPOSE_VERSION 2.17.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index 418e701ae..dfa6b38db 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db +ENV DOCKER_COMPOSE_VERSION 2.17.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b0d843a35..dde1d256a 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64" + "sha256": "6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6" + "sha256": "e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7" + "sha256": "72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64" + "sha256": "07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "4af67af4e63d9e47b7495be2a38cfb97f1f3f13dd11a304d32933564d2d6fbca", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-x86_64" + "sha256": "291b62b4a86bb2249ed3efe5a1d0a4f610d9cf3abe0f6441f2129bab3538623a", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "8cc28c1d9b6ef9cc3d4ec5bfe0a1e9125795dfe4f7875f52e086c780e9fc8f2d", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-aarch64" + "sha256": "7a59574d0d89fcf26965207819f5ae38ad75db335f9dfd593ff6b39e60231205", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le" + "sha256": "06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64" + "sha256": "51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x" + "sha256": "666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe" + "sha256": "556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "0d35207b27522202d9b74173700c2e20dc61ce3df970a05c4367e27d8dead29c", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-aarch64.exe" + "sha256": "914909bfbac9d13100f51a35ff94138ac418fc3dd79eb1ef0301f064aa7e7816", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.17.2" + "version": "2.17.3" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From c93aa758850cc2dd621276187291aaac4eee9cf2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 20 Apr 2023 10:07:54 -0700 Subject: [PATCH 182/667] Update 24-rc to compose 2.17.3 --- 24-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24-rc/cli/Dockerfile b/24-rc/cli/Dockerfile index 568482544..c012a88ce 100644 --- a/24-rc/cli/Dockerfile +++ b/24-rc/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.17.2 +ENV DOCKER_COMPOSE_VERSION 2.17.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64'; \ - sha256='895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64'; \ + sha256='6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6'; \ - sha256='16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6'; \ + sha256='e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7'; \ - sha256='4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7'; \ + sha256='72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64'; \ - sha256='fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64'; \ + sha256='07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le'; \ - sha256='546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le'; \ + sha256='06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64'; \ - sha256='65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64'; \ + sha256='51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x'; \ - sha256='4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0'; \ + url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x'; \ + sha256='666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24-rc/windows/windowsservercore-1809/Dockerfile b/24-rc/windows/windowsservercore-1809/Dockerfile index 9f06a2943..4035a32a4 100644 --- a/24-rc/windows/windowsservercore-1809/Dockerfile +++ b/24-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db +ENV DOCKER_COMPOSE_VERSION 2.17.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24-rc/windows/windowsservercore-ltsc2022/Dockerfile b/24-rc/windows/windowsservercore-ltsc2022/Dockerfile index 5fdd4ed35..b36967692 100644 --- a/24-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db +ENV DOCKER_COMPOSE_VERSION 2.17.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index dde1d256a..62239c571 100644 --- a/versions.json +++ b/versions.json @@ -358,61 +358,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "895e20812231543eae9f6b98ef9395327f4f21f1f31fa51fc252d21415802dda", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-x86_64" + "sha256": "6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "16a2ce7e9bc45cb864020fb61a4da7425162cb5215ee7c81c48f98b6a7c945c4", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv6" + "sha256": "e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4c8948696831fde2992e82dfcb505c5d6e4a56df9d759cd39a1dee6b6cded1c0", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-armv7" + "sha256": "72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "fcc2a21588907a7e6d9aa83538f134d2916f7a756cf391e5ce11b9d67bc4aad0", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-aarch64" + "sha256": "07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "4af67af4e63d9e47b7495be2a38cfb97f1f3f13dd11a304d32933564d2d6fbca", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-x86_64" + "sha256": "291b62b4a86bb2249ed3efe5a1d0a4f610d9cf3abe0f6441f2129bab3538623a", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "8cc28c1d9b6ef9cc3d4ec5bfe0a1e9125795dfe4f7875f52e086c780e9fc8f2d", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-darwin-aarch64" + "sha256": "7a59574d0d89fcf26965207819f5ae38ad75db335f9dfd593ff6b39e60231205", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "546e0421cda6f0bbedd82efc2d95daf9775ec736ae0c82bcdc051c952eee09cd", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-ppc64le" + "sha256": "06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "65824b6aad564debb5ae9f70423f94bf5bbf20062fa4d9d47d2d2bcaf6a822b7", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-riscv64" + "sha256": "51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "4fcf6d847203162eb0a698657b98007542047c167188df3c65cca047b4b656c0", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-linux-s390x" + "sha256": "666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0869cfe9d799d511e4eaf87029ed08ea256e7000f312023c062d7ddcadc385db", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-x86_64.exe" + "sha256": "556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "0d35207b27522202d9b74173700c2e20dc61ce3df970a05c4367e27d8dead29c", - "url": "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-windows-aarch64.exe" + "sha256": "914909bfbac9d13100f51a35ff94138ac418fc3dd79eb1ef0301f064aa7e7816", + "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.17.2" + "version": "2.17.3" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From fcb9d855506a0c0394908bf8ff88377b2dda0bb1 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 25 Apr 2023 14:09:12 -0700 Subject: [PATCH 183/667] Swap "git" variant to be "dind"-based in 23+ Historically, `docker build git://...` would invoke `git` in the client context, but `buildx` does so in the daemon context instead, and given that it is the default in 23+, let's adjust the git-including variant to be dind-based to simplify this for users who desire the 50MiB+ increase this workflow requires. --- 23.0/git/Dockerfile | 2 +- 24-rc/git/Dockerfile | 2 +- Dockerfile-git.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/23.0/git/Dockerfile b/23.0/git/Dockerfile index 51aca7971..6ed0adab8 100644 --- a/23.0/git/Dockerfile +++ b/23.0/git/Dockerfile @@ -4,6 +4,6 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:23.0-cli +FROM docker:23.0-dind RUN apk add --no-cache git diff --git a/24-rc/git/Dockerfile b/24-rc/git/Dockerfile index affa04f89..3ef9022c6 100644 --- a/24-rc/git/Dockerfile +++ b/24-rc/git/Dockerfile @@ -4,6 +4,6 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:24-rc-cli +FROM docker:24-rc-dind RUN apk add --no-cache git diff --git a/Dockerfile-git.template b/Dockerfile-git.template index 40606acc2..189842fc4 100644 --- a/Dockerfile-git.template +++ b/Dockerfile-git.template @@ -1,3 +1,3 @@ -FROM docker:{{ env.version }}-cli +FROM docker:{{ env.version }}-{{ if env.version | rtrimstr("-rc") == "20.10" then "cli" else "dind" end }} RUN apk add --no-cache git From d49ab87c526dae0fa10ba50fede014c33ec80b3c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 26 Apr 2023 13:00:03 -0700 Subject: [PATCH 184/667] Update 23.0 to 23.0.5 --- 23.0/cli/Dockerfile | 10 +++++----- 23.0/dind-rootless/Dockerfile | 4 ++-- 23.0/dind/Dockerfile | 8 ++++---- 23.0/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index cd78216ff..e84632c8a 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/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.4 +ENV DOCKER_VERSION 23.0.5 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.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.5.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.5.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/dind-rootless/Dockerfile b/23.0/dind-rootless/Dockerfile index d60837732..8af2f4c13 100644 --- a/23.0/dind-rootless/Dockerfile +++ b/23.0/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.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/dind/Dockerfile b/23.0/dind/Dockerfile index d9b7a6c01..ce04e6132 100644 --- a/23.0/dind/Dockerfile +++ b/23.0/dind/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.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.5.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.5.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index d509cec9a..02068e77b 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/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.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.4.zip +ENV DOCKER_VERSION 23.0.5 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.5.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/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index dfa6b38db..152bc05f4 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/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.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.4.zip +ENV DOCKER_VERSION 23.0.5 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.5.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/versions.json b/versions.json index 62239c571..6709ed52d 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "23.0": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.5.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.5.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.5.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.5.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.5.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.5.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.4.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.5.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "23.0.4" + "version": "23.0.5" }, "23.0-rc": null, "24": null, From 89b91f8164bd6a6bce035a1b8915df566994fb84 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 28 Apr 2023 09:30:00 -0700 Subject: [PATCH 185/667] Update 24-rc to 24.0.0-rc.1 --- 24-rc/cli/Dockerfile | 10 +++++----- 24-rc/dind-rootless/Dockerfile | 4 ++-- 24-rc/dind/Dockerfile | 8 ++++---- 24-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24-rc/cli/Dockerfile b/24-rc/cli/Dockerfile index c012a88ce..3c97005f5 100644 --- a/24-rc/cli/Dockerfile +++ b/24-rc/cli/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 24.0.0-beta.2 +ENV DOCKER_VERSION 24.0.0-rc.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/dind-rootless/Dockerfile b/24-rc/dind-rootless/Dockerfile index 540ec7d59..e4ac077d7 100644 --- a/24-rc/dind-rootless/Dockerfile +++ b/24-rc/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/test/x86_64/docker-rootless-extras-24.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/dind/Dockerfile b/24-rc/dind/Dockerfile index 00be095e2..cb05bfced 100644 --- a/24-rc/dind/Dockerfile +++ b/24-rc/dind/Dockerfile @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/windows/windowsservercore-1809/Dockerfile b/24-rc/windows/windowsservercore-1809/Dockerfile index 4035a32a4..abd862739 100644 --- a/24-rc/windows/windowsservercore-1809/Dockerfile +++ b/24-rc/windows/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 24.0.0-beta.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.2.zip +ENV DOCKER_VERSION 24.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.1.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/24-rc/windows/windowsservercore-ltsc2022/Dockerfile b/24-rc/windows/windowsservercore-ltsc2022/Dockerfile index b36967692..7cde84740 100644 --- a/24-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24-rc/windows/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 24.0.0-beta.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.2.zip +ENV DOCKER_VERSION 24.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.1.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/versions.json b/versions.json index 6709ed52d..ff15f70cc 100644 --- a/versions.json +++ b/versions.json @@ -287,21 +287,21 @@ "24-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-beta.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-beta.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-beta.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-beta.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-beta.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-beta.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-beta.2.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.1.zip" } }, "buildx": { @@ -423,6 +423,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.0-beta.2" + "version": "24.0.0-rc.1" } } From 56f5570b1f62e904a26cf4b96df0d440e2c49a7a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 6 May 2023 10:04:35 -0700 Subject: [PATCH 186/667] Update 24-rc to 24.0.0-rc.2 --- 24-rc/cli/Dockerfile | 10 +++++----- 24-rc/dind-rootless/Dockerfile | 4 ++-- 24-rc/dind/Dockerfile | 8 ++++---- 24-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24-rc/cli/Dockerfile b/24-rc/cli/Dockerfile index 3c97005f5..eeb0e0766 100644 --- a/24-rc/cli/Dockerfile +++ b/24-rc/cli/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 24.0.0-rc.1 +ENV DOCKER_VERSION 24.0.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/dind-rootless/Dockerfile b/24-rc/dind-rootless/Dockerfile index e4ac077d7..3996cd6f6 100644 --- a/24-rc/dind-rootless/Dockerfile +++ b/24-rc/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/test/x86_64/docker-rootless-extras-24.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/dind/Dockerfile b/24-rc/dind/Dockerfile index cb05bfced..05739d8c7 100644 --- a/24-rc/dind/Dockerfile +++ b/24-rc/dind/Dockerfile @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/windows/windowsservercore-1809/Dockerfile b/24-rc/windows/windowsservercore-1809/Dockerfile index abd862739..7934fad94 100644 --- a/24-rc/windows/windowsservercore-1809/Dockerfile +++ b/24-rc/windows/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 24.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.1.zip +ENV DOCKER_VERSION 24.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.2.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/24-rc/windows/windowsservercore-ltsc2022/Dockerfile b/24-rc/windows/windowsservercore-ltsc2022/Dockerfile index 7cde84740..13bad4487 100644 --- a/24-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24-rc/windows/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 24.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.1.zip +ENV DOCKER_VERSION 24.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.2.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/versions.json b/versions.json index ff15f70cc..f917a698c 100644 --- a/versions.json +++ b/versions.json @@ -287,21 +287,21 @@ "24-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.2.zip" } }, "buildx": { @@ -423,6 +423,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.0-rc.1" + "version": "24.0.0-rc.2" } } From 3f698e446071ef052c3bd70fe0322493dbfd5103 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 8 May 2023 10:04:22 -0700 Subject: [PATCH 187/667] Update 23.0 to 23.0.6 --- 23.0/cli/Dockerfile | 10 +++++----- 23.0/dind-rootless/Dockerfile | 4 ++-- 23.0/dind/Dockerfile | 8 ++++---- 23.0/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index e84632c8a..c8debf726 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/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.5 +ENV DOCKER_VERSION 23.0.6 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.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.6.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.6.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.6.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.6.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/dind-rootless/Dockerfile b/23.0/dind-rootless/Dockerfile index 8af2f4c13..08c8a01e1 100644 --- a/23.0/dind-rootless/Dockerfile +++ b/23.0/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.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.6.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.6.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/dind/Dockerfile b/23.0/dind/Dockerfile index ce04e6132..7692387f1 100644 --- a/23.0/dind/Dockerfile +++ b/23.0/dind/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.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.6.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-23.0.6.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.6.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.6.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index 02068e77b..d35a35a68 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/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.5 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.5.zip +ENV DOCKER_VERSION 23.0.6 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.6.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/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index 152bc05f4..67e0319f8 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/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.5 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.5.zip +ENV DOCKER_VERSION 23.0.6 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.6.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/versions.json b/versions.json index f917a698c..218a21359 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "23.0": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.5.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.6.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.6.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.6.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.6.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.5.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.6.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.6.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.5.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.6.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "23.0.5" + "version": "23.0.6" }, "23.0-rc": null, "24": null, From 1e7a4c385eee982a26601ba6279ae6e6b52ea8d8 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 10 May 2023 12:04:23 +0200 Subject: [PATCH 188/667] Update to Alpine 3.18 --- 20.10/cli/Dockerfile | 2 +- 23.0/cli/Dockerfile | 2 +- 24-rc/cli/Dockerfile | 2 +- Dockerfile-cli.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile index 64a22aa38..78e574e2e 100644 --- a/20.10/cli/Dockerfile +++ b/20.10/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.18 RUN apk add --no-cache \ ca-certificates \ diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index c8debf726..4327823c8 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.18 RUN apk add --no-cache \ ca-certificates \ diff --git a/24-rc/cli/Dockerfile b/24-rc/cli/Dockerfile index eeb0e0766..8f246f9ca 100644 --- a/24-rc/cli/Dockerfile +++ b/24-rc/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.18 RUN apk add --no-cache \ ca-certificates \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index a2f3ee7f9..61cd9bda7 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -1,5 +1,5 @@ {{ include "shared" -}} -FROM alpine:3.17 +FROM alpine:3.18 RUN apk add --no-cache \ ca-certificates \ From 9c900889e373ba8160632a6f02139be7e2c6b355 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 11 May 2023 14:35:47 -0700 Subject: [PATCH 189/667] Update 24-rc to 24.0.0-rc.3 --- 24-rc/cli/Dockerfile | 10 +++++----- 24-rc/dind-rootless/Dockerfile | 4 ++-- 24-rc/dind/Dockerfile | 8 ++++---- 24-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24-rc/cli/Dockerfile b/24-rc/cli/Dockerfile index 8f246f9ca..7f1978168 100644 --- a/24-rc/cli/Dockerfile +++ b/24-rc/cli/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 24.0.0-rc.2 +ENV DOCKER_VERSION 24.0.0-rc.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/dind-rootless/Dockerfile b/24-rc/dind-rootless/Dockerfile index 3996cd6f6..15a565383 100644 --- a/24-rc/dind-rootless/Dockerfile +++ b/24-rc/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/test/x86_64/docker-rootless-extras-24.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/dind/Dockerfile b/24-rc/dind/Dockerfile index 05739d8c7..bd89cc079 100644 --- a/24-rc/dind/Dockerfile +++ b/24-rc/dind/Dockerfile @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/windows/windowsservercore-1809/Dockerfile b/24-rc/windows/windowsservercore-1809/Dockerfile index 7934fad94..52bee2186 100644 --- a/24-rc/windows/windowsservercore-1809/Dockerfile +++ b/24-rc/windows/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 24.0.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.2.zip +ENV DOCKER_VERSION 24.0.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.3.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/24-rc/windows/windowsservercore-ltsc2022/Dockerfile b/24-rc/windows/windowsservercore-ltsc2022/Dockerfile index 13bad4487..6b5ca9ec9 100644 --- a/24-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24-rc/windows/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 24.0.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.2.zip +ENV DOCKER_VERSION 24.0.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.3.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/versions.json b/versions.json index 218a21359..c298f61f2 100644 --- a/versions.json +++ b/versions.json @@ -287,21 +287,21 @@ "24-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.2.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.3.zip" } }, "buildx": { @@ -423,6 +423,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.0-rc.2" + "version": "24.0.0-rc.3" } } From 38d8c1da029024c9f6cbfb306bdaf8461b3b5914 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 12 May 2023 15:34:53 -0700 Subject: [PATCH 190/667] Update 24-rc to 24.0.0-rc.4 --- 24-rc/cli/Dockerfile | 10 +++++----- 24-rc/dind-rootless/Dockerfile | 4 ++-- 24-rc/dind/Dockerfile | 8 ++++---- 24-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24-rc/cli/Dockerfile b/24-rc/cli/Dockerfile index 7f1978168..8ab27eb6d 100644 --- a/24-rc/cli/Dockerfile +++ b/24-rc/cli/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 24.0.0-rc.3 +ENV DOCKER_VERSION 24.0.0-rc.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/dind-rootless/Dockerfile b/24-rc/dind-rootless/Dockerfile index 15a565383..a6fb16895 100644 --- a/24-rc/dind-rootless/Dockerfile +++ b/24-rc/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/test/x86_64/docker-rootless-extras-24.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/dind/Dockerfile b/24-rc/dind/Dockerfile index bd89cc079..5db6be419 100644 --- a/24-rc/dind/Dockerfile +++ b/24-rc/dind/Dockerfile @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/windows/windowsservercore-1809/Dockerfile b/24-rc/windows/windowsservercore-1809/Dockerfile index 52bee2186..99cc0f4d6 100644 --- a/24-rc/windows/windowsservercore-1809/Dockerfile +++ b/24-rc/windows/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 24.0.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.3.zip +ENV DOCKER_VERSION 24.0.0-rc.4 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.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/24-rc/windows/windowsservercore-ltsc2022/Dockerfile b/24-rc/windows/windowsservercore-ltsc2022/Dockerfile index 6b5ca9ec9..24ba7b202 100644 --- a/24-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24-rc/windows/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 24.0.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.3.zip +ENV DOCKER_VERSION 24.0.0-rc.4 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.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/versions.json b/versions.json index c298f61f2..97e205ac6 100644 --- a/versions.json +++ b/versions.json @@ -287,21 +287,21 @@ "24-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.4.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.4.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.4.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.4.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.3.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.4.zip" } }, "buildx": { @@ -423,6 +423,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.0-rc.3" + "version": "24.0.0-rc.4" } } From 30134778cc8dc4def905d0adb8f04d3a0b148447 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 15 May 2023 07:46:07 -0700 Subject: [PATCH 191/667] Update README.md https://github.com/docker-library/docs/commit/8dacd84b1130b48fce743b2548d9aba0a3d566ee --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a2b8121af..88f555fba 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Maintained by: [Tianon (of the Docker Project)](https://github.com/docker-library/docker) -This is the Git repo of the [Docker "Official Image"](https://github.com/docker-library/official-images#what-are-official-images) for [`docker`](https://hub.docker.com/_/docker/) (not to be confused with any official `docker` image provided by `docker` upstream). See [the Docker Hub page](https://hub.docker.com/_/docker/) for the full readme on how to use this Docker image and for information regarding contributing and issues. +This is the Git repo of the [Docker "Official Image"](https://github.com/docker-library/official-images#what-are-official-images) for [`docker`](https://hub.docker.com/_/docker/). See [the Docker Hub page](https://hub.docker.com/_/docker/) for the full readme on how to use this Docker image and for information regarding contributing and issues. The [full image description on Docker Hub](https://hub.docker.com/_/docker/) is generated/maintained over in [the docker-library/docs repository](https://github.com/docker-library/docs), specifically in [the `docker` directory](https://github.com/docker-library/docs/tree/master/docker). From a3ca225e9c0e568cf87a7b60c951b939c3964c91 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 15 May 2023 15:35:11 -0700 Subject: [PATCH 192/667] Remove 20.10 With the release of v20.10.25, the 20.10 branch of the upstream Moby project is no longer going to have builds available on https://download.docker.com/ (where the builds for this image come from). This removes our 20.10 versions accordingly. --- 20.10/cli/Dockerfile | 163 -------------- 20.10/cli/docker-entrypoint.sh | 61 ------ 20.10/cli/modprobe.sh | 20 -- 20.10/dind-rootless/Dockerfile | 55 ----- 20.10/dind/Dockerfile | 89 -------- 20.10/dind/dockerd-entrypoint.sh | 200 ------------------ 20.10/git/Dockerfile | 9 - .../windows/windowsservercore-1809/Dockerfile | 91 -------- .../windowsservercore-ltsc2022/Dockerfile | 91 -------- 23.0/dind/dockerd-entrypoint.sh | 6 +- 24-rc/dind/dockerd-entrypoint.sh | 6 +- Dockerfile-cli.template | 4 - Dockerfile-git.template | 2 +- dockerd-entrypoint.sh | 6 +- generate-stackbrew-library.sh | 7 +- versions.json | 142 ------------- 16 files changed, 8 insertions(+), 944 deletions(-) delete mode 100644 20.10/cli/Dockerfile delete mode 100755 20.10/cli/docker-entrypoint.sh delete mode 100755 20.10/cli/modprobe.sh delete mode 100644 20.10/dind-rootless/Dockerfile delete mode 100644 20.10/dind/Dockerfile delete mode 100755 20.10/dind/dockerd-entrypoint.sh delete mode 100644 20.10/git/Dockerfile delete mode 100644 20.10/windows/windowsservercore-1809/Dockerfile delete mode 100644 20.10/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/20.10/cli/Dockerfile b/20.10/cli/Dockerfile deleted file mode 100644 index 78e574e2e..000000000 --- a/20.10/cli/Dockerfile +++ /dev/null @@ -1,163 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.18 - -RUN apk add --no-cache \ - ca-certificates \ -# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824, https://github.com/docker-library/docker/issues/377 - libc6-compat \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v20.10.21/hack/make.sh#L115 -# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303 -# - 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 20.10.24 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.24.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.24.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.24.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.24.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.10.4 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64'; \ - sha256='dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6'; \ - sha256='d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7'; \ - sha256='aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64'; \ - sha256='e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le'; \ - sha256='d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64'; \ - sha256='393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x'; \ - sha256='16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.17.3 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64'; \ - sha256='6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6'; \ - sha256='e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7'; \ - sha256='72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64'; \ - sha256='07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le'; \ - sha256='06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64'; \ - sha256='51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x'; \ - sha256='666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/20.10/cli/docker-entrypoint.sh b/20.10/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/20.10/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/20.10/cli/modprobe.sh b/20.10/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/20.10/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/20.10/dind-rootless/Dockerfile b/20.10/dind-rootless/Dockerfile deleted file mode 100644 index 8e60ecbce..000000000 --- a/20.10/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -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-20.10.24.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.24.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/20.10/dind/Dockerfile b/20.10/dind/Dockerfile deleted file mode 100644 index 74e1f1b23..000000000 --- a/20.10/dind/Dockerfile +++ /dev/null @@ -1,89 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:20.10-cli - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - ip6tables \ - iptables \ - openssl \ - shadow-uidmap \ - xfsprogs \ - xz \ -# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) - pigz \ - ; \ -# only install zfs if it's available for the current architecture -# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) -# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch - if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ - apk add --no-cache zfs; \ - fi - -# TODO aufs-tools - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.24.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-20.10.24.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.24.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.24.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:20.10-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 1f32e3c95d72a29b3eaacba156ed675dba976cb5 - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/20.10/dind/dockerd-entrypoint.sh b/20.10/dind/dockerd-entrypoint.sh deleted file mode 100755 index 0dd29c19b..000000000 --- a/20.10/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,200 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - if dockerd --version | grep -qF ' 20.10.'; then - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - fi - - if ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - modprobe ip_tables || : - fi - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/20.10/git/Dockerfile b/20.10/git/Dockerfile deleted file mode 100644 index 8851cd7b0..000000000 --- a/20.10/git/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:20.10-cli - -RUN apk add --no-cache git diff --git a/20.10/windows/windowsservercore-1809/Dockerfile b/20.10/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 310a28fc7..000000000 --- a/20.10/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 20.10.24 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.24.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.10.4 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/20.10/windows/windowsservercore-ltsc2022/Dockerfile b/20.10/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 824b5a6fa..000000000 --- a/20.10/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 20.10.24 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.24.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.10.4 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/23.0/dind/dockerd-entrypoint.sh b/23.0/dind/dockerd-entrypoint.sh index 0dd29c19b..00819384b 100755 --- a/23.0/dind/dockerd-entrypoint.sh +++ b/23.0/dind/dockerd-entrypoint.sh @@ -140,10 +140,8 @@ if [ "$1" = 'dockerd' ]; then # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) find /run /var/run -iname 'docker*.pid' -delete || : - if dockerd --version | grep -qF ' 20.10.'; then - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - fi + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" if ! iptables -nL > /dev/null 2>&1; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) diff --git a/24-rc/dind/dockerd-entrypoint.sh b/24-rc/dind/dockerd-entrypoint.sh index 0dd29c19b..00819384b 100755 --- a/24-rc/dind/dockerd-entrypoint.sh +++ b/24-rc/dind/dockerd-entrypoint.sh @@ -140,10 +140,8 @@ if [ "$1" = 'dockerd' ]; then # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) find /run /var/run -iname 'docker*.pid' -delete || : - if dockerd --version | grep -qF ' 20.10.'; then - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - fi + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" if ! iptables -nL > /dev/null 2>&1; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 61cd9bda7..be92d9521 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -3,10 +3,6 @@ FROM alpine:3.18 RUN apk add --no-cache \ ca-certificates \ -{{ if env.version | rtrimstr("-rc") == "20.10" then ( -}} -# Workaround for golang not producing a static ctr binary on Go 1.15 and up https://github.com/containerd/containerd/issues/5824, https://github.com/docker-library/docker/issues/377 - libc6-compat \ -{{ ) else "" end -}} # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 openssh-client diff --git a/Dockerfile-git.template b/Dockerfile-git.template index 189842fc4..3bab99c4c 100644 --- a/Dockerfile-git.template +++ b/Dockerfile-git.template @@ -1,3 +1,3 @@ -FROM docker:{{ env.version }}-{{ if env.version | rtrimstr("-rc") == "20.10" then "cli" else "dind" end }} +FROM docker:{{ env.version }}-dind RUN apk add --no-cache git diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 0dd29c19b..00819384b 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -140,10 +140,8 @@ if [ "$1" = 'dockerd' ]; then # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) find /run /var/run -iname 'docker*.pid' -delete || : - if dockerd --version | grep -qF ' 20.10.'; then - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - fi + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" if ! iptables -nL > /dev/null 2>&1; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 40c7055dc..2473c10de 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -158,11 +158,6 @@ for version; do variants="$(jq -r '.[env.version].variants | map(@sh) | join(" ")' versions.json)" eval "variants=( $variants )" - case "$rcVersion" in - 20.10) latestVariant='cli' ;; - *) latestVariant='dind' ;; - esac - for v in "${variants[@]}"; do dir="$version/$v" [ -f "$dir/Dockerfile" ] || continue @@ -180,7 +175,7 @@ for version; do suiteAliases=( "${suiteAliases[@]/%/-alpine$alpine}" ) suiteAliases=( "${suiteAliases[@]//latest-/}" ) variantAliases+=( "${suiteAliases[@]}" ) - if [ "$variant" = "$latestVariant" ]; then + if [ "$variant" = 'dind' ]; then # add "latest" aliases suiteAliases=( "${versionAliases[0]}" ) # only "X.Y.Z-foo" suiteAliases=( "${suiteAliases[@]/%/-alpine$alpine}" ) diff --git a/versions.json b/versions.json index 97e205ac6..dc5dbe515 100644 --- a/versions.json +++ b/versions.json @@ -1,146 +1,4 @@ { - "20.10": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.24.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.24.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-20.10.24.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-20.10.24.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-20.10.24.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.24.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-20.10.24.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.10.4.linux-amd64", - "sha256": "dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.10.4.linux-arm-v6", - "sha256": "d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.10.4.linux-arm-v7", - "sha256": "aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.10.4.linux-arm64", - "sha256": "e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64" - }, - "ppc64le": { - "file": "buildx-v0.10.4.linux-ppc64le", - "sha256": "d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.10.4.linux-riscv64", - "sha256": "393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.10.4.linux-s390x", - "sha256": "16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.10.4.windows-amd64.exe", - "sha256": "e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.10.4.windows-arm64.exe", - "sha256": "06349dd5c193732a8b04488ee056de95caf6fa30b3d4efdbf663cdb9090353f2", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-arm64.exe" - } - }, - "version": "0.10.4" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "291b62b4a86bb2249ed3efe5a1d0a4f610d9cf3abe0f6441f2129bab3538623a", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "7a59574d0d89fcf26965207819f5ae38ad75db335f9dfd593ff6b39e60231205", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "914909bfbac9d13100f51a35ff94138ac418fc3dd79eb1ef0301f064aa7e7816", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.17.3" - }, - "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", - "variants": [ - "cli", - "dind", - "dind-rootless", - "git", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "20.10.24" - }, - "20.10-rc": null, "23.0": { "arches": { "amd64": { From bf2e58c5371f706c0915a541195025482064c935 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 16 May 2023 10:04:16 -0700 Subject: [PATCH 193/667] Update 23.0 to compose 2.18.0 --- 23.0/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23.0/cli/Dockerfile b/23.0/cli/Dockerfile index 4327823c8..30298f0ac 100644 --- a/23.0/cli/Dockerfile +++ b/23.0/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.17.3 +ENV DOCKER_COMPOSE_VERSION 2.18.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64'; \ - sha256='6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-x86_64'; \ + sha256='02b69f1f23167fce126b16d9d6b645362f5a6fa7fc9a073d3d080e45e12d32fc'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6'; \ - sha256='e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv6'; \ + sha256='58cabf4745c8878a178e4283b5f272eb46fc4cb42b12ac47a487085838ae4a6c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7'; \ - sha256='72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv7'; \ + sha256='9e2dc7e0f7d572e6733ba9d66d8ffa063c66c00a262e138a1df5b324c4580e9d'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64'; \ - sha256='07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-aarch64'; \ + sha256='60444f990cd2e87cb1f3b5093d88afa6c8f58cb9c5477fdb31ff894deaee17c6'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le'; \ - sha256='06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-ppc64le'; \ + sha256='18a29f9f67ce1c3afbfc4720194db1002feae681d78469ed0cd39e04da009761'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64'; \ - sha256='51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-riscv64'; \ + sha256='c5ef1f3cb9bf2ab9f232f993d640c3f872d573494ad6b3081e6b8bc45bc58fe1'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x'; \ - sha256='666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-s390x'; \ + sha256='51af79cf31b0916f40ed3d0bef30a71a03dea1d794458a5c62770c3d8e1efce5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23.0/windows/windowsservercore-1809/Dockerfile index d35a35a68..c188ba640 100644 --- a/23.0/windows/windowsservercore-1809/Dockerfile +++ b/23.0/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 +ENV DOCKER_COMPOSE_VERSION 2.18.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23.0/windows/windowsservercore-ltsc2022/Dockerfile index 67e0319f8..0554e485d 100644 --- a/23.0/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23.0/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 +ENV DOCKER_COMPOSE_VERSION 2.18.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index dc5dbe515..f1db67cb8 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64" + "sha256": "02b69f1f23167fce126b16d9d6b645362f5a6fa7fc9a073d3d080e45e12d32fc", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6" + "sha256": "58cabf4745c8878a178e4283b5f272eb46fc4cb42b12ac47a487085838ae4a6c", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7" + "sha256": "9e2dc7e0f7d572e6733ba9d66d8ffa063c66c00a262e138a1df5b324c4580e9d", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64" + "sha256": "60444f990cd2e87cb1f3b5093d88afa6c8f58cb9c5477fdb31ff894deaee17c6", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "291b62b4a86bb2249ed3efe5a1d0a4f610d9cf3abe0f6441f2129bab3538623a", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-x86_64" + "sha256": "42036608e33e8e905f0683693109d0a8f126a66d2e534611b15919e0ea32b35c", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7a59574d0d89fcf26965207819f5ae38ad75db335f9dfd593ff6b39e60231205", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-aarch64" + "sha256": "6b22a7f04ebc4693a60e3e6ae248c2cee715b69cef740d1ad39e520fbc632922", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le" + "sha256": "18a29f9f67ce1c3afbfc4720194db1002feae681d78469ed0cd39e04da009761", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64" + "sha256": "c5ef1f3cb9bf2ab9f232f993d640c3f872d573494ad6b3081e6b8bc45bc58fe1", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x" + "sha256": "51af79cf31b0916f40ed3d0bef30a71a03dea1d794458a5c62770c3d8e1efce5", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe" + "sha256": "a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "914909bfbac9d13100f51a35ff94138ac418fc3dd79eb1ef0301f064aa7e7816", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-aarch64.exe" + "sha256": "a20adfd1ba8fd1c16873fe28c3637ca7c5bca68cbd928038574b343417f46b56", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.17.3" + "version": "2.18.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 0f1f89d7e097728a534ee566a9ba8450ab09bd0b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 16 May 2023 10:05:48 -0700 Subject: [PATCH 194/667] Update 24-rc to compose 2.18.0 --- 24-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24-rc/cli/Dockerfile b/24-rc/cli/Dockerfile index 8ab27eb6d..7ee585822 100644 --- a/24-rc/cli/Dockerfile +++ b/24-rc/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.17.3 +ENV DOCKER_COMPOSE_VERSION 2.18.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64'; \ - sha256='6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-x86_64'; \ + sha256='02b69f1f23167fce126b16d9d6b645362f5a6fa7fc9a073d3d080e45e12d32fc'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6'; \ - sha256='e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv6'; \ + sha256='58cabf4745c8878a178e4283b5f272eb46fc4cb42b12ac47a487085838ae4a6c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7'; \ - sha256='72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv7'; \ + sha256='9e2dc7e0f7d572e6733ba9d66d8ffa063c66c00a262e138a1df5b324c4580e9d'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64'; \ - sha256='07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-aarch64'; \ + sha256='60444f990cd2e87cb1f3b5093d88afa6c8f58cb9c5477fdb31ff894deaee17c6'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le'; \ - sha256='06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-ppc64le'; \ + sha256='18a29f9f67ce1c3afbfc4720194db1002feae681d78469ed0cd39e04da009761'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64'; \ - sha256='51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-riscv64'; \ + sha256='c5ef1f3cb9bf2ab9f232f993d640c3f872d573494ad6b3081e6b8bc45bc58fe1'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x'; \ - sha256='666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe'; \ + url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-s390x'; \ + sha256='51af79cf31b0916f40ed3d0bef30a71a03dea1d794458a5c62770c3d8e1efce5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24-rc/windows/windowsservercore-1809/Dockerfile b/24-rc/windows/windowsservercore-1809/Dockerfile index 99cc0f4d6..c591fcc79 100644 --- a/24-rc/windows/windowsservercore-1809/Dockerfile +++ b/24-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 +ENV DOCKER_COMPOSE_VERSION 2.18.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24-rc/windows/windowsservercore-ltsc2022/Dockerfile b/24-rc/windows/windowsservercore-ltsc2022/Dockerfile index 24ba7b202..7b1610d78 100644 --- a/24-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.17.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74 +ENV DOCKER_COMPOSE_VERSION 2.18.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f1db67cb8..335aafbfe 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6abb771a438b8ef82b0ff0ef0e2e404032699104c3c40c59cd174b56214876c3", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-x86_64" + "sha256": "02b69f1f23167fce126b16d9d6b645362f5a6fa7fc9a073d3d080e45e12d32fc", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e8c20e7e02faa623839ccb2af725ae0b343eafaf836b2386579e35c598d7468a", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv6" + "sha256": "58cabf4745c8878a178e4283b5f272eb46fc4cb42b12ac47a487085838ae4a6c", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "72c26a8ab6a519bd9c645a314d6ed33ed694efeda3f787123806990124446fe8", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-armv7" + "sha256": "9e2dc7e0f7d572e6733ba9d66d8ffa063c66c00a262e138a1df5b324c4580e9d", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "07bdced6f502ab24b481f46aa6b205f97e2256e5cb11279648ac9c088220a38d", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-aarch64" + "sha256": "60444f990cd2e87cb1f3b5093d88afa6c8f58cb9c5477fdb31ff894deaee17c6", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "291b62b4a86bb2249ed3efe5a1d0a4f610d9cf3abe0f6441f2129bab3538623a", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-x86_64" + "sha256": "42036608e33e8e905f0683693109d0a8f126a66d2e534611b15919e0ea32b35c", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7a59574d0d89fcf26965207819f5ae38ad75db335f9dfd593ff6b39e60231205", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-darwin-aarch64" + "sha256": "6b22a7f04ebc4693a60e3e6ae248c2cee715b69cef740d1ad39e520fbc632922", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "06075ea6594e42fd62360c029ed2b7cf294e8a50428cc3c8f0e022a68f672660", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-ppc64le" + "sha256": "18a29f9f67ce1c3afbfc4720194db1002feae681d78469ed0cd39e04da009761", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "51c3e1b631be5845aecc9a66d4d0525c94dfec4d20a4ccf535a7f960f780e9f2", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-riscv64" + "sha256": "c5ef1f3cb9bf2ab9f232f993d640c3f872d573494ad6b3081e6b8bc45bc58fe1", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "666a07a5605e985ac96608a315cdae8151e72196733147dd81b61dd42c0777fe", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-linux-s390x" + "sha256": "51af79cf31b0916f40ed3d0bef30a71a03dea1d794458a5c62770c3d8e1efce5", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "556cc1d373503a897ecc2def998a40b2ad1fe27ff049769eb912c7e208772e74", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-x86_64.exe" + "sha256": "a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "914909bfbac9d13100f51a35ff94138ac418fc3dd79eb1ef0301f064aa7e7816", - "url": "https://github.com/docker/compose/releases/download/v2.17.3/docker-compose-windows-aarch64.exe" + "sha256": "a20adfd1ba8fd1c16873fe28c3637ca7c5bca68cbd928038574b343417f46b56", + "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.17.3" + "version": "2.18.0" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From 6964fd52030c2e6e9e0943eaac07d78c9841fbb3 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 16 May 2023 10:55:49 -0700 Subject: [PATCH 195/667] Update to 24.0.0 (GA) --- {23.0 => 23}/cli/Dockerfile | 0 {23.0 => 23}/cli/docker-entrypoint.sh | 0 {23.0 => 23}/cli/modprobe.sh | 0 {23.0 => 23}/dind-rootless/Dockerfile | 2 +- {23.0 => 23}/dind/Dockerfile | 4 +-- {23.0 => 23}/dind/dockerd-entrypoint.sh | 0 {23.0 => 23}/git/Dockerfile | 2 +- .../windows/windowsservercore-1809/Dockerfile | 0 .../windowsservercore-ltsc2022/Dockerfile | 0 {24-rc => 24}/cli/Dockerfile | 10 +++---- {24-rc => 24}/cli/docker-entrypoint.sh | 0 {24-rc => 24}/cli/modprobe.sh | 0 {24-rc => 24}/dind-rootless/Dockerfile | 6 ++--- {24-rc => 24}/dind/Dockerfile | 12 ++++----- {24-rc => 24}/dind/dockerd-entrypoint.sh | 0 {24-rc => 24}/git/Dockerfile | 2 +- .../windows/windowsservercore-1809/Dockerfile | 4 +-- .../windowsservercore-ltsc2022/Dockerfile | 4 +-- generate-stackbrew-library.sh | 8 +++--- versions.json | 26 +++++++++---------- 20 files changed, 41 insertions(+), 39 deletions(-) rename {23.0 => 23}/cli/Dockerfile (100%) rename {23.0 => 23}/cli/docker-entrypoint.sh (100%) rename {23.0 => 23}/cli/modprobe.sh (100%) rename {23.0 => 23}/dind-rootless/Dockerfile (98%) rename {23.0 => 23}/dind/Dockerfile (94%) rename {23.0 => 23}/dind/dockerd-entrypoint.sh (100%) rename {23.0 => 23}/git/Dockerfile (85%) rename {23.0 => 23}/windows/windowsservercore-1809/Dockerfile (100%) rename {23.0 => 23}/windows/windowsservercore-ltsc2022/Dockerfile (100%) rename {24-rc => 24}/cli/Dockerfile (94%) rename {24-rc => 24}/cli/docker-entrypoint.sh (100%) rename {24-rc => 24}/cli/modprobe.sh (100%) rename {24-rc => 24}/dind-rootless/Dockerfile (86%) rename {24-rc => 24}/dind/Dockerfile (81%) rename {24-rc => 24}/dind/dockerd-entrypoint.sh (100%) rename {24-rc => 24}/git/Dockerfile (85%) rename {24-rc => 24}/windows/windowsservercore-1809/Dockerfile (96%) rename {24-rc => 24}/windows/windowsservercore-ltsc2022/Dockerfile (96%) diff --git a/23.0/cli/Dockerfile b/23/cli/Dockerfile similarity index 100% rename from 23.0/cli/Dockerfile rename to 23/cli/Dockerfile diff --git a/23.0/cli/docker-entrypoint.sh b/23/cli/docker-entrypoint.sh similarity index 100% rename from 23.0/cli/docker-entrypoint.sh rename to 23/cli/docker-entrypoint.sh diff --git a/23.0/cli/modprobe.sh b/23/cli/modprobe.sh similarity index 100% rename from 23.0/cli/modprobe.sh rename to 23/cli/modprobe.sh diff --git a/23.0/dind-rootless/Dockerfile b/23/dind-rootless/Dockerfile similarity index 98% rename from 23.0/dind-rootless/Dockerfile rename to 23/dind-rootless/Dockerfile index 08c8a01e1..d8db2e7c0 100644 --- a/23.0/dind-rootless/Dockerfile +++ b/23/dind-rootless/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:23.0-dind +FROM docker:23-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/23.0/dind/Dockerfile b/23/dind/Dockerfile similarity index 94% rename from 23.0/dind/Dockerfile rename to 23/dind/Dockerfile index 7692387f1..59c3165af 100644 --- a/23.0/dind/Dockerfile +++ b/23/dind/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:23.0-cli +FROM docker:23-cli # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies RUN set -eux; \ @@ -63,7 +63,7 @@ RUN set -eux; \ --strip-components 1 \ --directory /usr/local/bin/ \ --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:23.0-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer +# we exclude the CLI binary because we already extracted that over in the "docker:23-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer --exclude 'docker/docker' \ ; \ rm docker.tgz; \ diff --git a/23.0/dind/dockerd-entrypoint.sh b/23/dind/dockerd-entrypoint.sh similarity index 100% rename from 23.0/dind/dockerd-entrypoint.sh rename to 23/dind/dockerd-entrypoint.sh diff --git a/23.0/git/Dockerfile b/23/git/Dockerfile similarity index 85% rename from 23.0/git/Dockerfile rename to 23/git/Dockerfile index 6ed0adab8..cf58421bf 100644 --- a/23.0/git/Dockerfile +++ b/23/git/Dockerfile @@ -4,6 +4,6 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:23.0-dind +FROM docker:23-dind RUN apk add --no-cache git diff --git a/23.0/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile similarity index 100% rename from 23.0/windows/windowsservercore-1809/Dockerfile rename to 23/windows/windowsservercore-1809/Dockerfile diff --git a/23.0/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile similarity index 100% rename from 23.0/windows/windowsservercore-ltsc2022/Dockerfile rename to 23/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/24-rc/cli/Dockerfile b/24/cli/Dockerfile similarity index 94% rename from 24-rc/cli/Dockerfile rename to 24/cli/Dockerfile index 7ee585822..c638ea77a 100644 --- a/24-rc/cli/Dockerfile +++ b/24/cli/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 24.0.0-rc.4 +ENV DOCKER_VERSION 24.0.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/cli/docker-entrypoint.sh b/24/cli/docker-entrypoint.sh similarity index 100% rename from 24-rc/cli/docker-entrypoint.sh rename to 24/cli/docker-entrypoint.sh diff --git a/24-rc/cli/modprobe.sh b/24/cli/modprobe.sh similarity index 100% rename from 24-rc/cli/modprobe.sh rename to 24/cli/modprobe.sh diff --git a/24-rc/dind-rootless/Dockerfile b/24/dind-rootless/Dockerfile similarity index 86% rename from 24-rc/dind-rootless/Dockerfile rename to 24/dind-rootless/Dockerfile index a6fb16895..430de16a2 100644 --- a/24-rc/dind-rootless/Dockerfile +++ b/24/dind-rootless/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:24-rc-dind +FROM docker:24-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,10 +24,10 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24-rc/dind/Dockerfile b/24/dind/Dockerfile similarity index 81% rename from 24-rc/dind/Dockerfile rename to 24/dind/Dockerfile index 5db6be419..a4fbdafa0 100644 --- a/24-rc/dind/Dockerfile +++ b/24/dind/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:24-rc-cli +FROM docker:24-cli # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies RUN set -eux; \ @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ @@ -63,7 +63,7 @@ RUN set -eux; \ --strip-components 1 \ --directory /usr/local/bin/ \ --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:24-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer +# we exclude the CLI binary because we already extracted that over in the "docker:24-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer --exclude 'docker/docker' \ ; \ rm docker.tgz; \ diff --git a/24-rc/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh similarity index 100% rename from 24-rc/dind/dockerd-entrypoint.sh rename to 24/dind/dockerd-entrypoint.sh diff --git a/24-rc/git/Dockerfile b/24/git/Dockerfile similarity index 85% rename from 24-rc/git/Dockerfile rename to 24/git/Dockerfile index 3ef9022c6..0d649823f 100644 --- a/24-rc/git/Dockerfile +++ b/24/git/Dockerfile @@ -4,6 +4,6 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM docker:24-rc-dind +FROM docker:24-dind RUN apk add --no-cache git diff --git a/24-rc/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile similarity index 96% rename from 24-rc/windows/windowsservercore-1809/Dockerfile rename to 24/windows/windowsservercore-1809/Dockerfile index c591fcc79..30c65b55c 100644 --- a/24-rc/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/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 24.0.0-rc.4 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.4.zip +ENV DOCKER_VERSION 24.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.0.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/24-rc/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile similarity index 96% rename from 24-rc/windows/windowsservercore-ltsc2022/Dockerfile rename to 24/windows/windowsservercore-ltsc2022/Dockerfile index 7b1610d78..99f918e04 100644 --- a/24-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/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 24.0.0-rc.4 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.4.zip +ENV DOCKER_VERSION 24.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.0.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/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 2473c10de..4c1befe71 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -127,9 +127,11 @@ for version; do else versionAliases+=( $fullVersion ) fi - versionAliases+=( - $version - ) + if [ "$fullVersion" != "$version" ]; then + versionAliases+=( + $version + ) + fi # add a few channel/version-related aliases majorVersion="${version%%.*}" diff --git a/versions.json b/versions.json index 335aafbfe..02b8a8ad3 100644 --- a/versions.json +++ b/versions.json @@ -1,5 +1,5 @@ { - "23.0": { + "23": { "arches": { "amd64": { "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.6.tgz", @@ -140,26 +140,25 @@ ], "version": "23.0.6" }, - "23.0-rc": null, - "24": null, - "24-rc": { + "23-rc": null, + "24": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-24.0.0-rc.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-24.0.0-rc.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-24.0.0-rc.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-24.0.0-rc.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-24.0.0-rc.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-24.0.0-rc.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-24.0.0-rc.4.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.0.zip" } }, "buildx": { @@ -281,6 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.0-rc.4" - } + "version": "24.0.0" + }, + "24-rc": null } From 9e353b3ff876e900a7df872f5c0a9e096b1f9068 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 May 2023 16:04:13 -0700 Subject: [PATCH 196/667] Update 23 to compose 2.18.1 --- 23/cli/Dockerfile | 30 ++++++------ 23/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index 30298f0ac..d43bc60c6 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.18.0 +ENV DOCKER_COMPOSE_VERSION 2.18.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-x86_64'; \ - sha256='02b69f1f23167fce126b16d9d6b645362f5a6fa7fc9a073d3d080e45e12d32fc'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-x86_64'; \ + sha256='b4e6aff14c30f82ce26e94d37686b5598b3f870ce1e053927c853b4f4b128575'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv6'; \ - sha256='58cabf4745c8878a178e4283b5f272eb46fc4cb42b12ac47a487085838ae4a6c'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv6'; \ + sha256='34430890fe8ab68fe091a2907ebff174d1d6dcfc3d4e87f8c50bb105a2ac8b5f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv7'; \ - sha256='9e2dc7e0f7d572e6733ba9d66d8ffa063c66c00a262e138a1df5b324c4580e9d'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv7'; \ + sha256='cced34fc17c3689b5e0760b115ef481014eb004370a7b9380fc25eeef55570bb'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-aarch64'; \ - sha256='60444f990cd2e87cb1f3b5093d88afa6c8f58cb9c5477fdb31ff894deaee17c6'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-aarch64'; \ + sha256='6d1784542f74806ef0ed4e798d31c91604453eb06b86448b4c60d7df5d5b7afb'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-ppc64le'; \ - sha256='18a29f9f67ce1c3afbfc4720194db1002feae681d78469ed0cd39e04da009761'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-ppc64le'; \ + sha256='baa21ead951f0b0a0dc191e4dc7718e584961d0fcbb5969004bdcf1950203cde'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-riscv64'; \ - sha256='c5ef1f3cb9bf2ab9f232f993d640c3f872d573494ad6b3081e6b8bc45bc58fe1'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-riscv64'; \ + sha256='2e84879a8677bcebda18d7772a86fa107f3745ba693f7c9c397b9fede355e3f2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-s390x'; \ - sha256='51af79cf31b0916f40ed3d0bef30a71a03dea1d794458a5c62770c3d8e1efce5'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-s390x'; \ + sha256='e8d5669b5f11212310d080d239348fe293b783c7357bb1085728fbed69e519c9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index c188ba640..8a7a71b96 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.18.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e +ENV DOCKER_COMPOSE_VERSION 2.18.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index 0554e485d..4ed9843a6 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.18.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e +ENV DOCKER_COMPOSE_VERSION 2.18.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 02b8a8ad3..2a8939dde 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "02b69f1f23167fce126b16d9d6b645362f5a6fa7fc9a073d3d080e45e12d32fc", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-x86_64" + "sha256": "b4e6aff14c30f82ce26e94d37686b5598b3f870ce1e053927c853b4f4b128575", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "58cabf4745c8878a178e4283b5f272eb46fc4cb42b12ac47a487085838ae4a6c", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv6" + "sha256": "34430890fe8ab68fe091a2907ebff174d1d6dcfc3d4e87f8c50bb105a2ac8b5f", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9e2dc7e0f7d572e6733ba9d66d8ffa063c66c00a262e138a1df5b324c4580e9d", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv7" + "sha256": "cced34fc17c3689b5e0760b115ef481014eb004370a7b9380fc25eeef55570bb", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "60444f990cd2e87cb1f3b5093d88afa6c8f58cb9c5477fdb31ff894deaee17c6", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-aarch64" + "sha256": "6d1784542f74806ef0ed4e798d31c91604453eb06b86448b4c60d7df5d5b7afb", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "42036608e33e8e905f0683693109d0a8f126a66d2e534611b15919e0ea32b35c", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-darwin-x86_64" + "sha256": "57fd6629ab54629df2208adb726aa196e16ca6bb154b21794d4f1151fd66e81b", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "6b22a7f04ebc4693a60e3e6ae248c2cee715b69cef740d1ad39e520fbc632922", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-darwin-aarch64" + "sha256": "1885bf6e3d443123590bc2aa8de510f8f5bd33d605b75d233eb798f409dd3289", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "18a29f9f67ce1c3afbfc4720194db1002feae681d78469ed0cd39e04da009761", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-ppc64le" + "sha256": "baa21ead951f0b0a0dc191e4dc7718e584961d0fcbb5969004bdcf1950203cde", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "c5ef1f3cb9bf2ab9f232f993d640c3f872d573494ad6b3081e6b8bc45bc58fe1", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-riscv64" + "sha256": "2e84879a8677bcebda18d7772a86fa107f3745ba693f7c9c397b9fede355e3f2", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "51af79cf31b0916f40ed3d0bef30a71a03dea1d794458a5c62770c3d8e1efce5", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-s390x" + "sha256": "e8d5669b5f11212310d080d239348fe293b783c7357bb1085728fbed69e519c9", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe" + "sha256": "6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "a20adfd1ba8fd1c16873fe28c3637ca7c5bca68cbd928038574b343417f46b56", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-aarch64.exe" + "sha256": "4eec95300145a51c69ca5f0a8c87309fc7eabce70034d4f58021841d1fadd6fc", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.18.0" + "version": "2.18.1" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From f86bd38ef9c9eded6092f823b4127818fc19892b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 May 2023 16:05:37 -0700 Subject: [PATCH 197/667] Update 24 to compose 2.18.1 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index c638ea77a..5b57103a3 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.18.0 +ENV DOCKER_COMPOSE_VERSION 2.18.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-x86_64'; \ - sha256='02b69f1f23167fce126b16d9d6b645362f5a6fa7fc9a073d3d080e45e12d32fc'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-x86_64'; \ + sha256='b4e6aff14c30f82ce26e94d37686b5598b3f870ce1e053927c853b4f4b128575'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv6'; \ - sha256='58cabf4745c8878a178e4283b5f272eb46fc4cb42b12ac47a487085838ae4a6c'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv6'; \ + sha256='34430890fe8ab68fe091a2907ebff174d1d6dcfc3d4e87f8c50bb105a2ac8b5f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv7'; \ - sha256='9e2dc7e0f7d572e6733ba9d66d8ffa063c66c00a262e138a1df5b324c4580e9d'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv7'; \ + sha256='cced34fc17c3689b5e0760b115ef481014eb004370a7b9380fc25eeef55570bb'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-aarch64'; \ - sha256='60444f990cd2e87cb1f3b5093d88afa6c8f58cb9c5477fdb31ff894deaee17c6'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-aarch64'; \ + sha256='6d1784542f74806ef0ed4e798d31c91604453eb06b86448b4c60d7df5d5b7afb'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-ppc64le'; \ - sha256='18a29f9f67ce1c3afbfc4720194db1002feae681d78469ed0cd39e04da009761'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-ppc64le'; \ + sha256='baa21ead951f0b0a0dc191e4dc7718e584961d0fcbb5969004bdcf1950203cde'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-riscv64'; \ - sha256='c5ef1f3cb9bf2ab9f232f993d640c3f872d573494ad6b3081e6b8bc45bc58fe1'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-riscv64'; \ + sha256='2e84879a8677bcebda18d7772a86fa107f3745ba693f7c9c397b9fede355e3f2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-s390x'; \ - sha256='51af79cf31b0916f40ed3d0bef30a71a03dea1d794458a5c62770c3d8e1efce5'; \ + url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-s390x'; \ + sha256='e8d5669b5f11212310d080d239348fe293b783c7357bb1085728fbed69e519c9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 30c65b55c..b0b594af2 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.18.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e +ENV DOCKER_COMPOSE_VERSION 2.18.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 99f918e04..b915df6a8 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.18.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e +ENV DOCKER_COMPOSE_VERSION 2.18.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 2a8939dde..0c929ca86 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "02b69f1f23167fce126b16d9d6b645362f5a6fa7fc9a073d3d080e45e12d32fc", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-x86_64" + "sha256": "b4e6aff14c30f82ce26e94d37686b5598b3f870ce1e053927c853b4f4b128575", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "58cabf4745c8878a178e4283b5f272eb46fc4cb42b12ac47a487085838ae4a6c", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv6" + "sha256": "34430890fe8ab68fe091a2907ebff174d1d6dcfc3d4e87f8c50bb105a2ac8b5f", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9e2dc7e0f7d572e6733ba9d66d8ffa063c66c00a262e138a1df5b324c4580e9d", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-armv7" + "sha256": "cced34fc17c3689b5e0760b115ef481014eb004370a7b9380fc25eeef55570bb", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "60444f990cd2e87cb1f3b5093d88afa6c8f58cb9c5477fdb31ff894deaee17c6", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-aarch64" + "sha256": "6d1784542f74806ef0ed4e798d31c91604453eb06b86448b4c60d7df5d5b7afb", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "42036608e33e8e905f0683693109d0a8f126a66d2e534611b15919e0ea32b35c", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-darwin-x86_64" + "sha256": "57fd6629ab54629df2208adb726aa196e16ca6bb154b21794d4f1151fd66e81b", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "6b22a7f04ebc4693a60e3e6ae248c2cee715b69cef740d1ad39e520fbc632922", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-darwin-aarch64" + "sha256": "1885bf6e3d443123590bc2aa8de510f8f5bd33d605b75d233eb798f409dd3289", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "18a29f9f67ce1c3afbfc4720194db1002feae681d78469ed0cd39e04da009761", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-ppc64le" + "sha256": "baa21ead951f0b0a0dc191e4dc7718e584961d0fcbb5969004bdcf1950203cde", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "c5ef1f3cb9bf2ab9f232f993d640c3f872d573494ad6b3081e6b8bc45bc58fe1", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-riscv64" + "sha256": "2e84879a8677bcebda18d7772a86fa107f3745ba693f7c9c397b9fede355e3f2", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "51af79cf31b0916f40ed3d0bef30a71a03dea1d794458a5c62770c3d8e1efce5", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-linux-s390x" + "sha256": "e8d5669b5f11212310d080d239348fe293b783c7357bb1085728fbed69e519c9", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "a98df8912c7a5cc7be00c1819a920e0ecdd5e2a7402bb390606c7f3f3b28b24e", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-x86_64.exe" + "sha256": "6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "a20adfd1ba8fd1c16873fe28c3637ca7c5bca68cbd928038574b343417f46b56", - "url": "https://github.com/docker/compose/releases/download/v2.18.0/docker-compose-windows-aarch64.exe" + "sha256": "4eec95300145a51c69ca5f0a8c87309fc7eabce70034d4f58021841d1fadd6fc", + "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.18.0" + "version": "2.18.1" }, "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", "variants": [ From d5357e52fb5680f9d39846b6adb053d497e255dc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 19 May 2023 16:41:44 -0700 Subject: [PATCH 198/667] Update 24 to 24.0.1 --- 24/cli/Dockerfile | 10 +++++----- 24/dind-rootless/Dockerfile | 4 ++-- 24/dind/Dockerfile | 8 ++++---- 24/windows/windowsservercore-1809/Dockerfile | 4 ++-- 24/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 5b57103a3..1ca792ce6 100644 --- a/24/cli/Dockerfile +++ b/24/cli/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 24.0.0 +ENV DOCKER_VERSION 24.0.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind-rootless/Dockerfile b/24/dind-rootless/Dockerfile index 430de16a2..2e5b7480f 100644 --- a/24/dind-rootless/Dockerfile +++ b/24/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-24.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index a4fbdafa0..70f683f7d 100644 --- a/24/dind/Dockerfile +++ b/24/dind/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-24.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index b0b594af2..ec75d716d 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/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 24.0.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.0.zip +ENV DOCKER_VERSION 24.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.1.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/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index b915df6a8..c7650e078 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/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 24.0.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.0.zip +ENV DOCKER_VERSION 24.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.1.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/versions.json b/versions.json index 0c929ca86..798220ab5 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "24": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.1.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.0" + "version": "24.0.1" }, "24-rc": null } From 4431aa850f6ce1bff3bc08346d3ca026dec359a1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 22 May 2023 16:04:13 -0700 Subject: [PATCH 199/667] Update 23 to buildx 0.10.5 --- 23/cli/Dockerfile | 30 +++++----- 23/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index d43bc60c6..7668daca6 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -51,38 +51,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.4 +ENV DOCKER_BUILDX_VERSION 0.10.5 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64'; \ - sha256='dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-amd64'; \ + sha256='2f1995ee6c4e7d75668ff38242ce3381da71bd30a8ca1f648f077b0a066c742b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6'; \ - sha256='d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v6'; \ + sha256='cd8d8b3fe02b07d60d323af27da53c72c35516e7c8a52e649e3a68582e113e76'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7'; \ - sha256='aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v7'; \ + sha256='a10b60d9c541b30c8f46ed2c8e671c1c775125d6b71ff0b1787204c11ae84ba9'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64'; \ - sha256='e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm64'; \ + sha256='a60d2dfb46cbe66e7fa75c8fd4fc730bcf052e08b8e236df254c24600db388a9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le'; \ - sha256='d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-ppc64le'; \ + sha256='1c1ac2bcad35a7d423e093bceba04e3f0d3f4381e534b64e1fb67e0dc932c973'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64'; \ - sha256='393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-riscv64'; \ + sha256='f2da6e8ac73b00bafac1f4ecd76e126e8a3f6740adfcd04fbad0094d30274a55'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x'; \ - sha256='16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-s390x'; \ + sha256='9a64f9248a8fa6d5b114d5599018814a1fc950f1910aa73e4fb9d012ca9bcbe6'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index 8a7a71b96..100121ee1 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.10.4 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 +ENV DOCKER_BUILDX_VERSION 0.10.5 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index 4ed9843a6..21ccb6e7c 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.10.4 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 +ENV DOCKER_BUILDX_VERSION 0.10.5 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 798220ab5..ad7c78183 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.4.linux-amd64", - "sha256": "dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64" + "file": "buildx-v0.10.5.linux-amd64", + "sha256": "2f1995ee6c4e7d75668ff38242ce3381da71bd30a8ca1f648f077b0a066c742b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.4.linux-arm-v6", - "sha256": "d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6" + "file": "buildx-v0.10.5.linux-arm-v6", + "sha256": "cd8d8b3fe02b07d60d323af27da53c72c35516e7c8a52e649e3a68582e113e76", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.4.linux-arm-v7", - "sha256": "aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7" + "file": "buildx-v0.10.5.linux-arm-v7", + "sha256": "a10b60d9c541b30c8f46ed2c8e671c1c775125d6b71ff0b1787204c11ae84ba9", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.4.linux-arm64", - "sha256": "e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64" + "file": "buildx-v0.10.5.linux-arm64", + "sha256": "a60d2dfb46cbe66e7fa75c8fd4fc730bcf052e08b8e236df254c24600db388a9", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.4.linux-ppc64le", - "sha256": "d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le" + "file": "buildx-v0.10.5.linux-ppc64le", + "sha256": "1c1ac2bcad35a7d423e093bceba04e3f0d3f4381e534b64e1fb67e0dc932c973", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.4.linux-riscv64", - "sha256": "393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64" + "file": "buildx-v0.10.5.linux-riscv64", + "sha256": "f2da6e8ac73b00bafac1f4ecd76e126e8a3f6740adfcd04fbad0094d30274a55", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.4.linux-s390x", - "sha256": "16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x" + "file": "buildx-v0.10.5.linux-s390x", + "sha256": "9a64f9248a8fa6d5b114d5599018814a1fc950f1910aa73e4fb9d012ca9bcbe6", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.4.windows-amd64.exe", - "sha256": "e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe" + "file": "buildx-v0.10.5.windows-amd64.exe", + "sha256": "9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.4.windows-arm64.exe", - "sha256": "06349dd5c193732a8b04488ee056de95caf6fa30b3d4efdbf663cdb9090353f2", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-arm64.exe" + "file": "buildx-v0.10.5.windows-arm64.exe", + "sha256": "901a26667769fb316145092ce9fe8b900a241fb176b66f3a2370cb1c7111b52a", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-arm64.exe" } }, - "version": "0.10.4" + "version": "0.10.5" }, "compose": { "arches": { From 3ed3a49381cdce562ce1833284af80f24b29f10e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 22 May 2023 16:05:39 -0700 Subject: [PATCH 200/667] Update 24 to buildx 0.10.5 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 1ca792ce6..768d973b2 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -51,38 +51,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.4 +ENV DOCKER_BUILDX_VERSION 0.10.5 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64'; \ - sha256='dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-amd64'; \ + sha256='2f1995ee6c4e7d75668ff38242ce3381da71bd30a8ca1f648f077b0a066c742b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6'; \ - sha256='d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v6'; \ + sha256='cd8d8b3fe02b07d60d323af27da53c72c35516e7c8a52e649e3a68582e113e76'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7'; \ - sha256='aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v7'; \ + sha256='a10b60d9c541b30c8f46ed2c8e671c1c775125d6b71ff0b1787204c11ae84ba9'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64'; \ - sha256='e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm64'; \ + sha256='a60d2dfb46cbe66e7fa75c8fd4fc730bcf052e08b8e236df254c24600db388a9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le'; \ - sha256='d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-ppc64le'; \ + sha256='1c1ac2bcad35a7d423e093bceba04e3f0d3f4381e534b64e1fb67e0dc932c973'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64'; \ - sha256='393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-riscv64'; \ + sha256='f2da6e8ac73b00bafac1f4ecd76e126e8a3f6740adfcd04fbad0094d30274a55'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x'; \ - sha256='16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929'; \ + url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-s390x'; \ + sha256='9a64f9248a8fa6d5b114d5599018814a1fc950f1910aa73e4fb9d012ca9bcbe6'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index ec75d716d..b4b6516a7 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.10.4 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 +ENV DOCKER_BUILDX_VERSION 0.10.5 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index c7650e078..ad0e9675e 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.10.4 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1 +ENV DOCKER_BUILDX_VERSION 0.10.5 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ad7c78183..c9c261aff 100644 --- a/versions.json +++ b/versions.json @@ -164,52 +164,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.4.linux-amd64", - "sha256": "dbe68cdc537d0150fc83e3f30974cd0ca11c179dafbf27f32d6f063be26e869b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-amd64" + "file": "buildx-v0.10.5.linux-amd64", + "sha256": "2f1995ee6c4e7d75668ff38242ce3381da71bd30a8ca1f648f077b0a066c742b", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.4.linux-arm-v6", - "sha256": "d50aa01a22a53e5a0eae9918274c9931b813b5336c0e30061a6b1904efb0c5eb", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v6" + "file": "buildx-v0.10.5.linux-arm-v6", + "sha256": "cd8d8b3fe02b07d60d323af27da53c72c35516e7c8a52e649e3a68582e113e76", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.4.linux-arm-v7", - "sha256": "aabc8cef5b9221ecbcb0af9846004a30591540be8668504d70814efe870448c8", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm-v7" + "file": "buildx-v0.10.5.linux-arm-v7", + "sha256": "a10b60d9c541b30c8f46ed2c8e671c1c775125d6b71ff0b1787204c11ae84ba9", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.4.linux-arm64", - "sha256": "e8f666134cf4aa83ec2b1b6afef0c83b1ea1387984d7a40ae6657b7da4d82d91", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-arm64" + "file": "buildx-v0.10.5.linux-arm64", + "sha256": "a60d2dfb46cbe66e7fa75c8fd4fc730bcf052e08b8e236df254c24600db388a9", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.4.linux-ppc64le", - "sha256": "d107178f36e6c83286f3f9316e2f66b18f08306570cef209cb5840c880bd91ae", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-ppc64le" + "file": "buildx-v0.10.5.linux-ppc64le", + "sha256": "1c1ac2bcad35a7d423e093bceba04e3f0d3f4381e534b64e1fb67e0dc932c973", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.4.linux-riscv64", - "sha256": "393db8518aeb442d0ca5f3ccf4800622dfc5eb8993c29bbfccb023cbfde6cdbc", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-riscv64" + "file": "buildx-v0.10.5.linux-riscv64", + "sha256": "f2da6e8ac73b00bafac1f4ecd76e126e8a3f6740adfcd04fbad0094d30274a55", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.4.linux-s390x", - "sha256": "16ce9071c14293640e9bcd547ff01578c65cfc68fc6c154091abd81daaf10929", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.linux-s390x" + "file": "buildx-v0.10.5.linux-s390x", + "sha256": "9a64f9248a8fa6d5b114d5599018814a1fc950f1910aa73e4fb9d012ca9bcbe6", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.4.windows-amd64.exe", - "sha256": "e4bb5f70d98be80421bb26b78dd71fe9184a5f94315a6712f487e9eb252ad4f1", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-amd64.exe" + "file": "buildx-v0.10.5.windows-amd64.exe", + "sha256": "9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.4.windows-arm64.exe", - "sha256": "06349dd5c193732a8b04488ee056de95caf6fa30b3d4efdbf663cdb9090353f2", - "url": "https://github.com/docker/buildx/releases/download/v0.10.4/buildx-v0.10.4.windows-arm64.exe" + "file": "buildx-v0.10.5.windows-arm64.exe", + "sha256": "901a26667769fb316145092ce9fe8b900a241fb176b66f3a2370cb1c7111b52a", + "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-arm64.exe" } }, - "version": "0.10.4" + "version": "0.10.5" }, "compose": { "arches": { From 679ff1a932a1bdf4341fb0d5cb06f088c77d44bf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 26 May 2023 04:04:23 -0700 Subject: [PATCH 201/667] Update 24 to 24.0.2 --- 24/cli/Dockerfile | 10 +++++----- 24/dind-rootless/Dockerfile | 4 ++-- 24/dind/Dockerfile | 8 ++++---- 24/windows/windowsservercore-1809/Dockerfile | 4 ++-- 24/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 768d973b2..b4db6e60e 100644 --- a/24/cli/Dockerfile +++ b/24/cli/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 24.0.1 +ENV DOCKER_VERSION 24.0.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind-rootless/Dockerfile b/24/dind-rootless/Dockerfile index 2e5b7480f..73e3e9031 100644 --- a/24/dind-rootless/Dockerfile +++ b/24/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-24.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index 70f683f7d..dcf354cf7 100644 --- a/24/dind/Dockerfile +++ b/24/dind/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-24.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index b4b6516a7..655f53351 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/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 24.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.1.zip +ENV DOCKER_VERSION 24.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.2.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/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index ad0e9675e..24979263f 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/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 24.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.1.zip +ENV DOCKER_VERSION 24.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.2.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/versions.json b/versions.json index c9c261aff..c53bd2a5c 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "24": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.2.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.1" + "version": "24.0.2" }, "24-rc": null } From 09a8b6a03e9ab630f0f62cce43df38a285f80826 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 30 May 2023 16:04:12 -0700 Subject: [PATCH 202/667] Update 23 --- 23/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/23/dind/Dockerfile b/23/dind/Dockerfile index 59c3165af..0cc939c33 100644 --- a/23/dind/Dockerfile +++ b/23/dind/Dockerfile @@ -74,7 +74,7 @@ RUN set -eux; \ runc --version # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 1f32e3c95d72a29b3eaacba156ed675dba976cb5 +ENV DIND_COMMIT d58df1fc6c866447ce2cd129af10e5b507705624 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index c53bd2a5c..936ee952b 100644 --- a/versions.json +++ b/versions.json @@ -129,7 +129,7 @@ }, "version": "2.18.1" }, - "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", + "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ "cli", "dind", From 36a4df919e51b459eaf08c2f7d395b71d8e331c3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 30 May 2023 16:05:39 -0700 Subject: [PATCH 203/667] Update 24 --- 24/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index dcf354cf7..504ec9f0b 100644 --- a/24/dind/Dockerfile +++ b/24/dind/Dockerfile @@ -74,7 +74,7 @@ RUN set -eux; \ runc --version # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 1f32e3c95d72a29b3eaacba156ed675dba976cb5 +ENV DIND_COMMIT d58df1fc6c866447ce2cd129af10e5b507705624 RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index 936ee952b..814b2fd72 100644 --- a/versions.json +++ b/versions.json @@ -271,7 +271,7 @@ }, "version": "2.18.1" }, - "dindCommit": "1f32e3c95d72a29b3eaacba156ed675dba976cb5", + "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ "cli", "dind", From 09c6cc3e98de81e95d4bff0bc44e60332b37a617 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 13 Jun 2023 10:04:14 -0700 Subject: [PATCH 204/667] Update 23 to buildx 0.11.0 --- 23/cli/Dockerfile | 30 +++++----- 23/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index 7668daca6..9b9994774 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -51,38 +51,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.5 +ENV DOCKER_BUILDX_VERSION 0.11.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-amd64'; \ - sha256='2f1995ee6c4e7d75668ff38242ce3381da71bd30a8ca1f648f077b0a066c742b'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64'; \ + sha256='ec2c9da22c3b733ad96d6a6897750153d884f1b2b86f2864ee5f743ce931055d'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v6'; \ - sha256='cd8d8b3fe02b07d60d323af27da53c72c35516e7c8a52e649e3a68582e113e76'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v6'; \ + sha256='a925462288a55b709a42431fe39bb0e67f033961f02a4754897c4a388355feea'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v7'; \ - sha256='a10b60d9c541b30c8f46ed2c8e671c1c775125d6b71ff0b1787204c11ae84ba9'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v7'; \ + sha256='e3f18a0d10346d8e53aff743fccfc0b95e45dc0235c3b0b72b49d3452c72b9e0'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm64'; \ - sha256='a60d2dfb46cbe66e7fa75c8fd4fc730bcf052e08b8e236df254c24600db388a9'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm64'; \ + sha256='e50f34f8feb7004407f826a375090bec6191891c473347b41b05cf5864bc5240'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-ppc64le'; \ - sha256='1c1ac2bcad35a7d423e093bceba04e3f0d3f4381e534b64e1fb67e0dc932c973'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-ppc64le'; \ + sha256='de8670ab6b2c34feb32289d04af07014bb4517de879d1fdb6e31a00da28f1df4'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-riscv64'; \ - sha256='f2da6e8ac73b00bafac1f4ecd76e126e8a3f6740adfcd04fbad0094d30274a55'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-riscv64'; \ + sha256='a07ad5791d6e60094e38147ef5f5eac406b2692aa380eae5ac866bde91bcdc89'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-s390x'; \ - sha256='9a64f9248a8fa6d5b114d5599018814a1fc950f1910aa73e4fb9d012ca9bcbe6'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-s390x'; \ + sha256='fc1a57b9fb69f7736908bbea94013eb17b5ae03cd5ed99b0bd61e223f9b6e4a7'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index 100121ee1..930575012 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.10.5 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7 +ENV DOCKER_BUILDX_VERSION 0.11.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index 21ccb6e7c..e889953fe 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.10.5 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7 +ENV DOCKER_BUILDX_VERSION 0.11.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 814b2fd72..0d51e5a15 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.5.linux-amd64", - "sha256": "2f1995ee6c4e7d75668ff38242ce3381da71bd30a8ca1f648f077b0a066c742b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-amd64" + "file": "buildx-v0.11.0.linux-amd64", + "sha256": "ec2c9da22c3b733ad96d6a6897750153d884f1b2b86f2864ee5f743ce931055d", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.5.linux-arm-v6", - "sha256": "cd8d8b3fe02b07d60d323af27da53c72c35516e7c8a52e649e3a68582e113e76", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v6" + "file": "buildx-v0.11.0.linux-arm-v6", + "sha256": "a925462288a55b709a42431fe39bb0e67f033961f02a4754897c4a388355feea", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.5.linux-arm-v7", - "sha256": "a10b60d9c541b30c8f46ed2c8e671c1c775125d6b71ff0b1787204c11ae84ba9", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v7" + "file": "buildx-v0.11.0.linux-arm-v7", + "sha256": "e3f18a0d10346d8e53aff743fccfc0b95e45dc0235c3b0b72b49d3452c72b9e0", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.5.linux-arm64", - "sha256": "a60d2dfb46cbe66e7fa75c8fd4fc730bcf052e08b8e236df254c24600db388a9", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm64" + "file": "buildx-v0.11.0.linux-arm64", + "sha256": "e50f34f8feb7004407f826a375090bec6191891c473347b41b05cf5864bc5240", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.5.linux-ppc64le", - "sha256": "1c1ac2bcad35a7d423e093bceba04e3f0d3f4381e534b64e1fb67e0dc932c973", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-ppc64le" + "file": "buildx-v0.11.0.linux-ppc64le", + "sha256": "de8670ab6b2c34feb32289d04af07014bb4517de879d1fdb6e31a00da28f1df4", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.5.linux-riscv64", - "sha256": "f2da6e8ac73b00bafac1f4ecd76e126e8a3f6740adfcd04fbad0094d30274a55", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-riscv64" + "file": "buildx-v0.11.0.linux-riscv64", + "sha256": "a07ad5791d6e60094e38147ef5f5eac406b2692aa380eae5ac866bde91bcdc89", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.5.linux-s390x", - "sha256": "9a64f9248a8fa6d5b114d5599018814a1fc950f1910aa73e4fb9d012ca9bcbe6", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-s390x" + "file": "buildx-v0.11.0.linux-s390x", + "sha256": "fc1a57b9fb69f7736908bbea94013eb17b5ae03cd5ed99b0bd61e223f9b6e4a7", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.5.windows-amd64.exe", - "sha256": "9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe" + "file": "buildx-v0.11.0.windows-amd64.exe", + "sha256": "e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.5.windows-arm64.exe", - "sha256": "901a26667769fb316145092ce9fe8b900a241fb176b66f3a2370cb1c7111b52a", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-arm64.exe" + "file": "buildx-v0.11.0.windows-arm64.exe", + "sha256": "7e62a7e2fa51939be37f7cfc6dfdfa9f8dadacd5092ac7573267cc765cf4a8b5", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-arm64.exe" } }, - "version": "0.10.5" + "version": "0.11.0" }, "compose": { "arches": { From 2788daa08c8580471e25f61d9d4203add10c41d3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 13 Jun 2023 10:05:42 -0700 Subject: [PATCH 205/667] Update 24 to buildx 0.11.0 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index b4db6e60e..94c48564a 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -51,38 +51,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.10.5 +ENV DOCKER_BUILDX_VERSION 0.11.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-amd64'; \ - sha256='2f1995ee6c4e7d75668ff38242ce3381da71bd30a8ca1f648f077b0a066c742b'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64'; \ + sha256='ec2c9da22c3b733ad96d6a6897750153d884f1b2b86f2864ee5f743ce931055d'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v6'; \ - sha256='cd8d8b3fe02b07d60d323af27da53c72c35516e7c8a52e649e3a68582e113e76'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v6'; \ + sha256='a925462288a55b709a42431fe39bb0e67f033961f02a4754897c4a388355feea'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v7'; \ - sha256='a10b60d9c541b30c8f46ed2c8e671c1c775125d6b71ff0b1787204c11ae84ba9'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v7'; \ + sha256='e3f18a0d10346d8e53aff743fccfc0b95e45dc0235c3b0b72b49d3452c72b9e0'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm64'; \ - sha256='a60d2dfb46cbe66e7fa75c8fd4fc730bcf052e08b8e236df254c24600db388a9'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm64'; \ + sha256='e50f34f8feb7004407f826a375090bec6191891c473347b41b05cf5864bc5240'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-ppc64le'; \ - sha256='1c1ac2bcad35a7d423e093bceba04e3f0d3f4381e534b64e1fb67e0dc932c973'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-ppc64le'; \ + sha256='de8670ab6b2c34feb32289d04af07014bb4517de879d1fdb6e31a00da28f1df4'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-riscv64'; \ - sha256='f2da6e8ac73b00bafac1f4ecd76e126e8a3f6740adfcd04fbad0094d30274a55'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-riscv64'; \ + sha256='a07ad5791d6e60094e38147ef5f5eac406b2692aa380eae5ac866bde91bcdc89'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-s390x'; \ - sha256='9a64f9248a8fa6d5b114d5599018814a1fc950f1910aa73e4fb9d012ca9bcbe6'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-s390x'; \ + sha256='fc1a57b9fb69f7736908bbea94013eb17b5ae03cd5ed99b0bd61e223f9b6e4a7'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 655f53351..eb84a361a 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.10.5 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7 +ENV DOCKER_BUILDX_VERSION 0.11.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 24979263f..8603b764e 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.10.5 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7 +ENV DOCKER_BUILDX_VERSION 0.11.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 0d51e5a15..63644e34d 100644 --- a/versions.json +++ b/versions.json @@ -164,52 +164,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.10.5.linux-amd64", - "sha256": "2f1995ee6c4e7d75668ff38242ce3381da71bd30a8ca1f648f077b0a066c742b", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-amd64" + "file": "buildx-v0.11.0.linux-amd64", + "sha256": "ec2c9da22c3b733ad96d6a6897750153d884f1b2b86f2864ee5f743ce931055d", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.10.5.linux-arm-v6", - "sha256": "cd8d8b3fe02b07d60d323af27da53c72c35516e7c8a52e649e3a68582e113e76", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v6" + "file": "buildx-v0.11.0.linux-arm-v6", + "sha256": "a925462288a55b709a42431fe39bb0e67f033961f02a4754897c4a388355feea", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.10.5.linux-arm-v7", - "sha256": "a10b60d9c541b30c8f46ed2c8e671c1c775125d6b71ff0b1787204c11ae84ba9", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm-v7" + "file": "buildx-v0.11.0.linux-arm-v7", + "sha256": "e3f18a0d10346d8e53aff743fccfc0b95e45dc0235c3b0b72b49d3452c72b9e0", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.10.5.linux-arm64", - "sha256": "a60d2dfb46cbe66e7fa75c8fd4fc730bcf052e08b8e236df254c24600db388a9", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-arm64" + "file": "buildx-v0.11.0.linux-arm64", + "sha256": "e50f34f8feb7004407f826a375090bec6191891c473347b41b05cf5864bc5240", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.10.5.linux-ppc64le", - "sha256": "1c1ac2bcad35a7d423e093bceba04e3f0d3f4381e534b64e1fb67e0dc932c973", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-ppc64le" + "file": "buildx-v0.11.0.linux-ppc64le", + "sha256": "de8670ab6b2c34feb32289d04af07014bb4517de879d1fdb6e31a00da28f1df4", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.10.5.linux-riscv64", - "sha256": "f2da6e8ac73b00bafac1f4ecd76e126e8a3f6740adfcd04fbad0094d30274a55", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-riscv64" + "file": "buildx-v0.11.0.linux-riscv64", + "sha256": "a07ad5791d6e60094e38147ef5f5eac406b2692aa380eae5ac866bde91bcdc89", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.10.5.linux-s390x", - "sha256": "9a64f9248a8fa6d5b114d5599018814a1fc950f1910aa73e4fb9d012ca9bcbe6", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.linux-s390x" + "file": "buildx-v0.11.0.linux-s390x", + "sha256": "fc1a57b9fb69f7736908bbea94013eb17b5ae03cd5ed99b0bd61e223f9b6e4a7", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.10.5.windows-amd64.exe", - "sha256": "9dbb9ab9b8f2aba21d2a9ea9113b98bebeed886a7df358dcdfe08bca1fd3ddb7", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-amd64.exe" + "file": "buildx-v0.11.0.windows-amd64.exe", + "sha256": "e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.10.5.windows-arm64.exe", - "sha256": "901a26667769fb316145092ce9fe8b900a241fb176b66f3a2370cb1c7111b52a", - "url": "https://github.com/docker/buildx/releases/download/v0.10.5/buildx-v0.10.5.windows-arm64.exe" + "file": "buildx-v0.11.0.windows-arm64.exe", + "sha256": "7e62a7e2fa51939be37f7cfc6dfdfa9f8dadacd5092ac7573267cc765cf4a8b5", + "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-arm64.exe" } }, - "version": "0.10.5" + "version": "0.11.0" }, "compose": { "arches": { From b946a07d9759c098df4e76fe4a96416457b53caf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 21 Jun 2023 10:04:13 -0700 Subject: [PATCH 206/667] Update 23 to compose 2.19.0 --- 23/cli/Dockerfile | 30 ++++++------ 23/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index 9b9994774..fd2bddf60 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.18.1 +ENV DOCKER_COMPOSE_VERSION 2.19.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-x86_64'; \ - sha256='b4e6aff14c30f82ce26e94d37686b5598b3f870ce1e053927c853b4f4b128575'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-x86_64'; \ + sha256='34e3b754d13eab683222f67827e20f640dfe0630b3b786c49a9de3f7fc7400a6'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv6'; \ - sha256='34430890fe8ab68fe091a2907ebff174d1d6dcfc3d4e87f8c50bb105a2ac8b5f'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv6'; \ + sha256='49ba58cabcdc0778507f152baa2a84ef5d1417ac3dc4d7f4fbd492a77ec0638b'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv7'; \ - sha256='cced34fc17c3689b5e0760b115ef481014eb004370a7b9380fc25eeef55570bb'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv7'; \ + sha256='0c0e3af9ae2b833e09b303899ef3330d40c09ec13a4def861c22b3d0a7ec8540'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-aarch64'; \ - sha256='6d1784542f74806ef0ed4e798d31c91604453eb06b86448b4c60d7df5d5b7afb'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-aarch64'; \ + sha256='c963c6d913a57e0571104ecb8f8ba0502516eafd7b784b5abc4a0d96ebb54d04'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-ppc64le'; \ - sha256='baa21ead951f0b0a0dc191e4dc7718e584961d0fcbb5969004bdcf1950203cde'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-ppc64le'; \ + sha256='317696f8a7cefc244d2e97779b926da93ce3bfb95be5ca56dde868c495560d50'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-riscv64'; \ - sha256='2e84879a8677bcebda18d7772a86fa107f3745ba693f7c9c397b9fede355e3f2'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-riscv64'; \ + sha256='e1b150cb49b34598c7b06985df5f19268394869902e787aa6a0542e700c20a50'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-s390x'; \ - sha256='e8d5669b5f11212310d080d239348fe293b783c7357bb1085728fbed69e519c9'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-s390x'; \ + sha256='83cb57f3b8025afd7002f0ab48056e857ce2d8aece9ff47193c772d05966a137'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index 930575012..c14461b21 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.18.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4 +ENV DOCKER_COMPOSE_VERSION 2.19.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index e889953fe..8cbab6579 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.18.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4 +ENV DOCKER_COMPOSE_VERSION 2.19.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 63644e34d..c37a43dd5 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "b4e6aff14c30f82ce26e94d37686b5598b3f870ce1e053927c853b4f4b128575", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-x86_64" + "sha256": "34e3b754d13eab683222f67827e20f640dfe0630b3b786c49a9de3f7fc7400a6", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "34430890fe8ab68fe091a2907ebff174d1d6dcfc3d4e87f8c50bb105a2ac8b5f", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv6" + "sha256": "49ba58cabcdc0778507f152baa2a84ef5d1417ac3dc4d7f4fbd492a77ec0638b", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "cced34fc17c3689b5e0760b115ef481014eb004370a7b9380fc25eeef55570bb", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv7" + "sha256": "0c0e3af9ae2b833e09b303899ef3330d40c09ec13a4def861c22b3d0a7ec8540", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "6d1784542f74806ef0ed4e798d31c91604453eb06b86448b4c60d7df5d5b7afb", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-aarch64" + "sha256": "c963c6d913a57e0571104ecb8f8ba0502516eafd7b784b5abc4a0d96ebb54d04", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "57fd6629ab54629df2208adb726aa196e16ca6bb154b21794d4f1151fd66e81b", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-darwin-x86_64" + "sha256": "a9fa167c391816b637b484fda93a74ba4057cbe68087cee2411a02a998be6a3a", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "1885bf6e3d443123590bc2aa8de510f8f5bd33d605b75d233eb798f409dd3289", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-darwin-aarch64" + "sha256": "3908fa756cfc48b09761f8e8669ced0ee680179fce6d75359aafba01c1c16a4a", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "baa21ead951f0b0a0dc191e4dc7718e584961d0fcbb5969004bdcf1950203cde", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-ppc64le" + "sha256": "317696f8a7cefc244d2e97779b926da93ce3bfb95be5ca56dde868c495560d50", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "2e84879a8677bcebda18d7772a86fa107f3745ba693f7c9c397b9fede355e3f2", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-riscv64" + "sha256": "e1b150cb49b34598c7b06985df5f19268394869902e787aa6a0542e700c20a50", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "e8d5669b5f11212310d080d239348fe293b783c7357bb1085728fbed69e519c9", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-s390x" + "sha256": "83cb57f3b8025afd7002f0ab48056e857ce2d8aece9ff47193c772d05966a137", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe" + "sha256": "dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "4eec95300145a51c69ca5f0a8c87309fc7eabce70034d4f58021841d1fadd6fc", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-aarch64.exe" + "sha256": "ed97c286e721e463e755dc7a51ae65b4fac85deeecaeb0bd38ee8bb11137725a", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.18.1" + "version": "2.19.0" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 9062f0762067534e63dbc712b3cef833f3a62be4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 21 Jun 2023 10:05:45 -0700 Subject: [PATCH 207/667] Update 24 to compose 2.19.0 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 94c48564a..523149f46 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.18.1 +ENV DOCKER_COMPOSE_VERSION 2.19.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-x86_64'; \ - sha256='b4e6aff14c30f82ce26e94d37686b5598b3f870ce1e053927c853b4f4b128575'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-x86_64'; \ + sha256='34e3b754d13eab683222f67827e20f640dfe0630b3b786c49a9de3f7fc7400a6'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv6'; \ - sha256='34430890fe8ab68fe091a2907ebff174d1d6dcfc3d4e87f8c50bb105a2ac8b5f'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv6'; \ + sha256='49ba58cabcdc0778507f152baa2a84ef5d1417ac3dc4d7f4fbd492a77ec0638b'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv7'; \ - sha256='cced34fc17c3689b5e0760b115ef481014eb004370a7b9380fc25eeef55570bb'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv7'; \ + sha256='0c0e3af9ae2b833e09b303899ef3330d40c09ec13a4def861c22b3d0a7ec8540'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-aarch64'; \ - sha256='6d1784542f74806ef0ed4e798d31c91604453eb06b86448b4c60d7df5d5b7afb'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-aarch64'; \ + sha256='c963c6d913a57e0571104ecb8f8ba0502516eafd7b784b5abc4a0d96ebb54d04'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-ppc64le'; \ - sha256='baa21ead951f0b0a0dc191e4dc7718e584961d0fcbb5969004bdcf1950203cde'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-ppc64le'; \ + sha256='317696f8a7cefc244d2e97779b926da93ce3bfb95be5ca56dde868c495560d50'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-riscv64'; \ - sha256='2e84879a8677bcebda18d7772a86fa107f3745ba693f7c9c397b9fede355e3f2'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-riscv64'; \ + sha256='e1b150cb49b34598c7b06985df5f19268394869902e787aa6a0542e700c20a50'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-s390x'; \ - sha256='e8d5669b5f11212310d080d239348fe293b783c7357bb1085728fbed69e519c9'; \ + url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-s390x'; \ + sha256='83cb57f3b8025afd7002f0ab48056e857ce2d8aece9ff47193c772d05966a137'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index eb84a361a..85588de9f 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.18.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4 +ENV DOCKER_COMPOSE_VERSION 2.19.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 8603b764e..4beb5285c 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.18.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4 +ENV DOCKER_COMPOSE_VERSION 2.19.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index c37a43dd5..ca25e6afc 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "b4e6aff14c30f82ce26e94d37686b5598b3f870ce1e053927c853b4f4b128575", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-x86_64" + "sha256": "34e3b754d13eab683222f67827e20f640dfe0630b3b786c49a9de3f7fc7400a6", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "34430890fe8ab68fe091a2907ebff174d1d6dcfc3d4e87f8c50bb105a2ac8b5f", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv6" + "sha256": "49ba58cabcdc0778507f152baa2a84ef5d1417ac3dc4d7f4fbd492a77ec0638b", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "cced34fc17c3689b5e0760b115ef481014eb004370a7b9380fc25eeef55570bb", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-armv7" + "sha256": "0c0e3af9ae2b833e09b303899ef3330d40c09ec13a4def861c22b3d0a7ec8540", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "6d1784542f74806ef0ed4e798d31c91604453eb06b86448b4c60d7df5d5b7afb", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-aarch64" + "sha256": "c963c6d913a57e0571104ecb8f8ba0502516eafd7b784b5abc4a0d96ebb54d04", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "57fd6629ab54629df2208adb726aa196e16ca6bb154b21794d4f1151fd66e81b", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-darwin-x86_64" + "sha256": "a9fa167c391816b637b484fda93a74ba4057cbe68087cee2411a02a998be6a3a", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "1885bf6e3d443123590bc2aa8de510f8f5bd33d605b75d233eb798f409dd3289", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-darwin-aarch64" + "sha256": "3908fa756cfc48b09761f8e8669ced0ee680179fce6d75359aafba01c1c16a4a", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "baa21ead951f0b0a0dc191e4dc7718e584961d0fcbb5969004bdcf1950203cde", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-ppc64le" + "sha256": "317696f8a7cefc244d2e97779b926da93ce3bfb95be5ca56dde868c495560d50", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "2e84879a8677bcebda18d7772a86fa107f3745ba693f7c9c397b9fede355e3f2", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-riscv64" + "sha256": "e1b150cb49b34598c7b06985df5f19268394869902e787aa6a0542e700c20a50", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "e8d5669b5f11212310d080d239348fe293b783c7357bb1085728fbed69e519c9", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-linux-s390x" + "sha256": "83cb57f3b8025afd7002f0ab48056e857ce2d8aece9ff47193c772d05966a137", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "6083a9057010a6a048d83c94318d254657abee48600baca2402fbe887d0b7ec4", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-x86_64.exe" + "sha256": "dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "4eec95300145a51c69ca5f0a8c87309fc7eabce70034d4f58021841d1fadd6fc", - "url": "https://github.com/docker/compose/releases/download/v2.18.1/docker-compose-windows-aarch64.exe" + "sha256": "ed97c286e721e463e755dc7a51ae65b4fac85deeecaeb0bd38ee8bb11137725a", + "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.18.1" + "version": "2.19.0" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 33d3ca8c880b85738eec201527afef4e21cbba3d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 29 Jun 2023 16:04:13 -0700 Subject: [PATCH 208/667] Update 23 to compose 2.19.1 --- 23/cli/Dockerfile | 30 ++++++------ 23/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index fd2bddf60..dace62004 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.19.0 +ENV DOCKER_COMPOSE_VERSION 2.19.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-x86_64'; \ - sha256='34e3b754d13eab683222f67827e20f640dfe0630b3b786c49a9de3f7fc7400a6'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-x86_64'; \ + sha256='8d3ecd3e48c598ba2e2d8eb3b59380f74c8c0c46259008fcd16d0dc058aaebd1'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv6'; \ - sha256='49ba58cabcdc0778507f152baa2a84ef5d1417ac3dc4d7f4fbd492a77ec0638b'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv6'; \ + sha256='78639fa8323f0f60cd8b45a882bbb63cc630b44a7187e922195855cb64607d8f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv7'; \ - sha256='0c0e3af9ae2b833e09b303899ef3330d40c09ec13a4def861c22b3d0a7ec8540'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv7'; \ + sha256='bc9646ecf835e5e2665b7de6455c07cb21d4e892a4c212f9ca9f3024a26ff880'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-aarch64'; \ - sha256='c963c6d913a57e0571104ecb8f8ba0502516eafd7b784b5abc4a0d96ebb54d04'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-aarch64'; \ + sha256='35db0e5207c66e002bfde3cab84e907aa7e552812803bebebf990487729eb2bf'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-ppc64le'; \ - sha256='317696f8a7cefc244d2e97779b926da93ce3bfb95be5ca56dde868c495560d50'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-ppc64le'; \ + sha256='9c79eada1314e63734eb33e9d1815b5f494c357b45ac1c3ec035188ee616f215'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-riscv64'; \ - sha256='e1b150cb49b34598c7b06985df5f19268394869902e787aa6a0542e700c20a50'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-riscv64'; \ + sha256='bcca185b3f1f2e6dbb392149f52676075b1e42ba64a3ed6508c2f9fc1b60c634'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-s390x'; \ - sha256='83cb57f3b8025afd7002f0ab48056e857ce2d8aece9ff47193c772d05966a137'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-s390x'; \ + sha256='152e40b9f600b84223b8c2f217c45ed4813af8cdd98017cdcbdb35b81423f8d9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index c14461b21..4048de96b 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.19.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573 +ENV DOCKER_COMPOSE_VERSION 2.19.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index 8cbab6579..054cda498 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.19.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573 +ENV DOCKER_COMPOSE_VERSION 2.19.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ca25e6afc..4f87c1f21 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "34e3b754d13eab683222f67827e20f640dfe0630b3b786c49a9de3f7fc7400a6", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-x86_64" + "sha256": "8d3ecd3e48c598ba2e2d8eb3b59380f74c8c0c46259008fcd16d0dc058aaebd1", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "49ba58cabcdc0778507f152baa2a84ef5d1417ac3dc4d7f4fbd492a77ec0638b", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv6" + "sha256": "78639fa8323f0f60cd8b45a882bbb63cc630b44a7187e922195855cb64607d8f", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "0c0e3af9ae2b833e09b303899ef3330d40c09ec13a4def861c22b3d0a7ec8540", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv7" + "sha256": "bc9646ecf835e5e2665b7de6455c07cb21d4e892a4c212f9ca9f3024a26ff880", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "c963c6d913a57e0571104ecb8f8ba0502516eafd7b784b5abc4a0d96ebb54d04", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-aarch64" + "sha256": "35db0e5207c66e002bfde3cab84e907aa7e552812803bebebf990487729eb2bf", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "a9fa167c391816b637b484fda93a74ba4057cbe68087cee2411a02a998be6a3a", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-darwin-x86_64" + "sha256": "056faeefeb5e0089e9295e2331ee6d8b352050286514c69f1bec9d2c12948e9b", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "3908fa756cfc48b09761f8e8669ced0ee680179fce6d75359aafba01c1c16a4a", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-darwin-aarch64" + "sha256": "5ecb092d8bf7ad463154edc2a7632c126519d989744c2f42b7ee7da5cbc06a77", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "317696f8a7cefc244d2e97779b926da93ce3bfb95be5ca56dde868c495560d50", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-ppc64le" + "sha256": "9c79eada1314e63734eb33e9d1815b5f494c357b45ac1c3ec035188ee616f215", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e1b150cb49b34598c7b06985df5f19268394869902e787aa6a0542e700c20a50", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-riscv64" + "sha256": "bcca185b3f1f2e6dbb392149f52676075b1e42ba64a3ed6508c2f9fc1b60c634", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "83cb57f3b8025afd7002f0ab48056e857ce2d8aece9ff47193c772d05966a137", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-s390x" + "sha256": "152e40b9f600b84223b8c2f217c45ed4813af8cdd98017cdcbdb35b81423f8d9", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe" + "sha256": "e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "ed97c286e721e463e755dc7a51ae65b4fac85deeecaeb0bd38ee8bb11137725a", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-aarch64.exe" + "sha256": "8ecc1081e259517cfee322403d4e9382da743679da5737d7748a0130abdd3e53", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.19.0" + "version": "2.19.1" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 49df3ea7f5626d756abcf90928c68bf354a1c961 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 29 Jun 2023 16:05:40 -0700 Subject: [PATCH 209/667] Update 24 to compose 2.19.1 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 523149f46..85b541652 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.19.0 +ENV DOCKER_COMPOSE_VERSION 2.19.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-x86_64'; \ - sha256='34e3b754d13eab683222f67827e20f640dfe0630b3b786c49a9de3f7fc7400a6'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-x86_64'; \ + sha256='8d3ecd3e48c598ba2e2d8eb3b59380f74c8c0c46259008fcd16d0dc058aaebd1'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv6'; \ - sha256='49ba58cabcdc0778507f152baa2a84ef5d1417ac3dc4d7f4fbd492a77ec0638b'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv6'; \ + sha256='78639fa8323f0f60cd8b45a882bbb63cc630b44a7187e922195855cb64607d8f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv7'; \ - sha256='0c0e3af9ae2b833e09b303899ef3330d40c09ec13a4def861c22b3d0a7ec8540'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv7'; \ + sha256='bc9646ecf835e5e2665b7de6455c07cb21d4e892a4c212f9ca9f3024a26ff880'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-aarch64'; \ - sha256='c963c6d913a57e0571104ecb8f8ba0502516eafd7b784b5abc4a0d96ebb54d04'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-aarch64'; \ + sha256='35db0e5207c66e002bfde3cab84e907aa7e552812803bebebf990487729eb2bf'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-ppc64le'; \ - sha256='317696f8a7cefc244d2e97779b926da93ce3bfb95be5ca56dde868c495560d50'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-ppc64le'; \ + sha256='9c79eada1314e63734eb33e9d1815b5f494c357b45ac1c3ec035188ee616f215'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-riscv64'; \ - sha256='e1b150cb49b34598c7b06985df5f19268394869902e787aa6a0542e700c20a50'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-riscv64'; \ + sha256='bcca185b3f1f2e6dbb392149f52676075b1e42ba64a3ed6508c2f9fc1b60c634'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-s390x'; \ - sha256='83cb57f3b8025afd7002f0ab48056e857ce2d8aece9ff47193c772d05966a137'; \ + url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-s390x'; \ + sha256='152e40b9f600b84223b8c2f217c45ed4813af8cdd98017cdcbdb35b81423f8d9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 85588de9f..634560c9b 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.19.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573 +ENV DOCKER_COMPOSE_VERSION 2.19.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 4beb5285c..4dd821cec 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.19.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573 +ENV DOCKER_COMPOSE_VERSION 2.19.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 4f87c1f21..2760076e4 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "34e3b754d13eab683222f67827e20f640dfe0630b3b786c49a9de3f7fc7400a6", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-x86_64" + "sha256": "8d3ecd3e48c598ba2e2d8eb3b59380f74c8c0c46259008fcd16d0dc058aaebd1", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "49ba58cabcdc0778507f152baa2a84ef5d1417ac3dc4d7f4fbd492a77ec0638b", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv6" + "sha256": "78639fa8323f0f60cd8b45a882bbb63cc630b44a7187e922195855cb64607d8f", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "0c0e3af9ae2b833e09b303899ef3330d40c09ec13a4def861c22b3d0a7ec8540", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-armv7" + "sha256": "bc9646ecf835e5e2665b7de6455c07cb21d4e892a4c212f9ca9f3024a26ff880", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "c963c6d913a57e0571104ecb8f8ba0502516eafd7b784b5abc4a0d96ebb54d04", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-aarch64" + "sha256": "35db0e5207c66e002bfde3cab84e907aa7e552812803bebebf990487729eb2bf", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "a9fa167c391816b637b484fda93a74ba4057cbe68087cee2411a02a998be6a3a", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-darwin-x86_64" + "sha256": "056faeefeb5e0089e9295e2331ee6d8b352050286514c69f1bec9d2c12948e9b", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "3908fa756cfc48b09761f8e8669ced0ee680179fce6d75359aafba01c1c16a4a", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-darwin-aarch64" + "sha256": "5ecb092d8bf7ad463154edc2a7632c126519d989744c2f42b7ee7da5cbc06a77", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "317696f8a7cefc244d2e97779b926da93ce3bfb95be5ca56dde868c495560d50", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-ppc64le" + "sha256": "9c79eada1314e63734eb33e9d1815b5f494c357b45ac1c3ec035188ee616f215", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e1b150cb49b34598c7b06985df5f19268394869902e787aa6a0542e700c20a50", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-riscv64" + "sha256": "bcca185b3f1f2e6dbb392149f52676075b1e42ba64a3ed6508c2f9fc1b60c634", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "83cb57f3b8025afd7002f0ab48056e857ce2d8aece9ff47193c772d05966a137", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-linux-s390x" + "sha256": "152e40b9f600b84223b8c2f217c45ed4813af8cdd98017cdcbdb35b81423f8d9", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "dc6bd9c2016bbf7564959249204af044edf57ea4ff40238c5ecb4541a9d41573", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-x86_64.exe" + "sha256": "e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "ed97c286e721e463e755dc7a51ae65b4fac85deeecaeb0bd38ee8bb11137725a", - "url": "https://github.com/docker/compose/releases/download/v2.19.0/docker-compose-windows-aarch64.exe" + "sha256": "8ecc1081e259517cfee322403d4e9382da743679da5737d7748a0130abdd3e53", + "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.19.0" + "version": "2.19.1" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From ec8f74674afa9565206f38a9e3964b61823dd5e9 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 5 Jul 2023 16:04:13 -0700 Subject: [PATCH 210/667] Update 23 to buildx 0.11.1 --- 23/cli/Dockerfile | 30 +++++----- 23/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index dace62004..3a675c548 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -51,38 +51,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.11.0 +ENV DOCKER_BUILDX_VERSION 0.11.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64'; \ - sha256='ec2c9da22c3b733ad96d6a6897750153d884f1b2b86f2864ee5f743ce931055d'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-amd64'; \ + sha256='34927047282ef9052f57809fe94783b2dc0ab556fdd60c2c0b7f4e6e5f05a53b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v6'; \ - sha256='a925462288a55b709a42431fe39bb0e67f033961f02a4754897c4a388355feea'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v6'; \ + sha256='ec7b60a4946c7c0fdaa3a44590adc08a0ead0ecca860358c57ca62d3e9a3a0be'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v7'; \ - sha256='e3f18a0d10346d8e53aff743fccfc0b95e45dc0235c3b0b72b49d3452c72b9e0'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v7'; \ + sha256='d122ec20622a744419fea021fd4850edc56d816b5cbc746d1f90184dbc227fec'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm64'; \ - sha256='e50f34f8feb7004407f826a375090bec6191891c473347b41b05cf5864bc5240'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm64'; \ + sha256='1649de43c6477eb8bf615f0817932e69e500ce530422bed47c9f3a689baeb788'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-ppc64le'; \ - sha256='de8670ab6b2c34feb32289d04af07014bb4517de879d1fdb6e31a00da28f1df4'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-ppc64le'; \ + sha256='78cfc6cdb3982770ce4e922e62c42ee0750b4b2837349661d20834356f004d16'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-riscv64'; \ - sha256='a07ad5791d6e60094e38147ef5f5eac406b2692aa380eae5ac866bde91bcdc89'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-riscv64'; \ + sha256='1d932a0925e9aee66c85cb7a351e9dbd210294ccb8d01208bf953108ad321f4d'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-s390x'; \ - sha256='fc1a57b9fb69f7736908bbea94013eb17b5ae03cd5ed99b0bd61e223f9b6e4a7'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-s390x'; \ + sha256='89466f278264f597d3c81e5230ab5795b2578ad62d2c7e8f8be398546e02c3d7'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index 4048de96b..6219add1c 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f +ENV DOCKER_BUILDX_VERSION 0.11.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index 054cda498..3ce949272 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f +ENV DOCKER_BUILDX_VERSION 0.11.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 2760076e4..947b5a2ec 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.11.0.linux-amd64", - "sha256": "ec2c9da22c3b733ad96d6a6897750153d884f1b2b86f2864ee5f743ce931055d", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64" + "file": "buildx-v0.11.1.linux-amd64", + "sha256": "34927047282ef9052f57809fe94783b2dc0ab556fdd60c2c0b7f4e6e5f05a53b", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.11.0.linux-arm-v6", - "sha256": "a925462288a55b709a42431fe39bb0e67f033961f02a4754897c4a388355feea", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v6" + "file": "buildx-v0.11.1.linux-arm-v6", + "sha256": "ec7b60a4946c7c0fdaa3a44590adc08a0ead0ecca860358c57ca62d3e9a3a0be", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.11.0.linux-arm-v7", - "sha256": "e3f18a0d10346d8e53aff743fccfc0b95e45dc0235c3b0b72b49d3452c72b9e0", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v7" + "file": "buildx-v0.11.1.linux-arm-v7", + "sha256": "d122ec20622a744419fea021fd4850edc56d816b5cbc746d1f90184dbc227fec", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.11.0.linux-arm64", - "sha256": "e50f34f8feb7004407f826a375090bec6191891c473347b41b05cf5864bc5240", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm64" + "file": "buildx-v0.11.1.linux-arm64", + "sha256": "1649de43c6477eb8bf615f0817932e69e500ce530422bed47c9f3a689baeb788", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.11.0.linux-ppc64le", - "sha256": "de8670ab6b2c34feb32289d04af07014bb4517de879d1fdb6e31a00da28f1df4", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-ppc64le" + "file": "buildx-v0.11.1.linux-ppc64le", + "sha256": "78cfc6cdb3982770ce4e922e62c42ee0750b4b2837349661d20834356f004d16", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.11.0.linux-riscv64", - "sha256": "a07ad5791d6e60094e38147ef5f5eac406b2692aa380eae5ac866bde91bcdc89", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-riscv64" + "file": "buildx-v0.11.1.linux-riscv64", + "sha256": "1d932a0925e9aee66c85cb7a351e9dbd210294ccb8d01208bf953108ad321f4d", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.11.0.linux-s390x", - "sha256": "fc1a57b9fb69f7736908bbea94013eb17b5ae03cd5ed99b0bd61e223f9b6e4a7", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-s390x" + "file": "buildx-v0.11.1.linux-s390x", + "sha256": "89466f278264f597d3c81e5230ab5795b2578ad62d2c7e8f8be398546e02c3d7", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.11.0.windows-amd64.exe", - "sha256": "e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe" + "file": "buildx-v0.11.1.windows-amd64.exe", + "sha256": "ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.11.0.windows-arm64.exe", - "sha256": "7e62a7e2fa51939be37f7cfc6dfdfa9f8dadacd5092ac7573267cc765cf4a8b5", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-arm64.exe" + "file": "buildx-v0.11.1.windows-arm64.exe", + "sha256": "17841db6529e5ba64e42082bb1f6760db522220f996892fe0ee6c2220d2ea020", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-arm64.exe" } }, - "version": "0.11.0" + "version": "0.11.1" }, "compose": { "arches": { From dcbd24594e559d325788ef9aa80a890cb344de11 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 5 Jul 2023 16:05:42 -0700 Subject: [PATCH 211/667] Update 24 to buildx 0.11.1 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 85b541652..140f05e9b 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -51,38 +51,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.11.0 +ENV DOCKER_BUILDX_VERSION 0.11.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64'; \ - sha256='ec2c9da22c3b733ad96d6a6897750153d884f1b2b86f2864ee5f743ce931055d'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-amd64'; \ + sha256='34927047282ef9052f57809fe94783b2dc0ab556fdd60c2c0b7f4e6e5f05a53b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v6'; \ - sha256='a925462288a55b709a42431fe39bb0e67f033961f02a4754897c4a388355feea'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v6'; \ + sha256='ec7b60a4946c7c0fdaa3a44590adc08a0ead0ecca860358c57ca62d3e9a3a0be'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v7'; \ - sha256='e3f18a0d10346d8e53aff743fccfc0b95e45dc0235c3b0b72b49d3452c72b9e0'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v7'; \ + sha256='d122ec20622a744419fea021fd4850edc56d816b5cbc746d1f90184dbc227fec'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm64'; \ - sha256='e50f34f8feb7004407f826a375090bec6191891c473347b41b05cf5864bc5240'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm64'; \ + sha256='1649de43c6477eb8bf615f0817932e69e500ce530422bed47c9f3a689baeb788'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-ppc64le'; \ - sha256='de8670ab6b2c34feb32289d04af07014bb4517de879d1fdb6e31a00da28f1df4'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-ppc64le'; \ + sha256='78cfc6cdb3982770ce4e922e62c42ee0750b4b2837349661d20834356f004d16'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-riscv64'; \ - sha256='a07ad5791d6e60094e38147ef5f5eac406b2692aa380eae5ac866bde91bcdc89'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-riscv64'; \ + sha256='1d932a0925e9aee66c85cb7a351e9dbd210294ccb8d01208bf953108ad321f4d'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-s390x'; \ - sha256='fc1a57b9fb69f7736908bbea94013eb17b5ae03cd5ed99b0bd61e223f9b6e4a7'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-s390x'; \ + sha256='89466f278264f597d3c81e5230ab5795b2578ad62d2c7e8f8be398546e02c3d7'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 634560c9b..afb1f14b9 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f +ENV DOCKER_BUILDX_VERSION 0.11.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 4dd821cec..f935c87d1 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f +ENV DOCKER_BUILDX_VERSION 0.11.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 947b5a2ec..aa8d0f0c8 100644 --- a/versions.json +++ b/versions.json @@ -164,52 +164,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.11.0.linux-amd64", - "sha256": "ec2c9da22c3b733ad96d6a6897750153d884f1b2b86f2864ee5f743ce931055d", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-amd64" + "file": "buildx-v0.11.1.linux-amd64", + "sha256": "34927047282ef9052f57809fe94783b2dc0ab556fdd60c2c0b7f4e6e5f05a53b", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.11.0.linux-arm-v6", - "sha256": "a925462288a55b709a42431fe39bb0e67f033961f02a4754897c4a388355feea", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v6" + "file": "buildx-v0.11.1.linux-arm-v6", + "sha256": "ec7b60a4946c7c0fdaa3a44590adc08a0ead0ecca860358c57ca62d3e9a3a0be", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.11.0.linux-arm-v7", - "sha256": "e3f18a0d10346d8e53aff743fccfc0b95e45dc0235c3b0b72b49d3452c72b9e0", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm-v7" + "file": "buildx-v0.11.1.linux-arm-v7", + "sha256": "d122ec20622a744419fea021fd4850edc56d816b5cbc746d1f90184dbc227fec", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.11.0.linux-arm64", - "sha256": "e50f34f8feb7004407f826a375090bec6191891c473347b41b05cf5864bc5240", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-arm64" + "file": "buildx-v0.11.1.linux-arm64", + "sha256": "1649de43c6477eb8bf615f0817932e69e500ce530422bed47c9f3a689baeb788", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.11.0.linux-ppc64le", - "sha256": "de8670ab6b2c34feb32289d04af07014bb4517de879d1fdb6e31a00da28f1df4", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-ppc64le" + "file": "buildx-v0.11.1.linux-ppc64le", + "sha256": "78cfc6cdb3982770ce4e922e62c42ee0750b4b2837349661d20834356f004d16", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.11.0.linux-riscv64", - "sha256": "a07ad5791d6e60094e38147ef5f5eac406b2692aa380eae5ac866bde91bcdc89", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-riscv64" + "file": "buildx-v0.11.1.linux-riscv64", + "sha256": "1d932a0925e9aee66c85cb7a351e9dbd210294ccb8d01208bf953108ad321f4d", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.11.0.linux-s390x", - "sha256": "fc1a57b9fb69f7736908bbea94013eb17b5ae03cd5ed99b0bd61e223f9b6e4a7", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.linux-s390x" + "file": "buildx-v0.11.1.linux-s390x", + "sha256": "89466f278264f597d3c81e5230ab5795b2578ad62d2c7e8f8be398546e02c3d7", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.11.0.windows-amd64.exe", - "sha256": "e314569943a591a097fa9119bf786556a4eb5c710e8ddefa57e95cd95aa7cc7f", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-amd64.exe" + "file": "buildx-v0.11.1.windows-amd64.exe", + "sha256": "ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.11.0.windows-arm64.exe", - "sha256": "7e62a7e2fa51939be37f7cfc6dfdfa9f8dadacd5092ac7573267cc765cf4a8b5", - "url": "https://github.com/docker/buildx/releases/download/v0.11.0/buildx-v0.11.0.windows-arm64.exe" + "file": "buildx-v0.11.1.windows-arm64.exe", + "sha256": "17841db6529e5ba64e42082bb1f6760db522220f996892fe0ee6c2220d2ea020", + "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-arm64.exe" } }, - "version": "0.11.0" + "version": "0.11.1" }, "compose": { "arches": { From 12b164a60b5eb485f3343f7f9c67f1d4ebe19e60 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 6 Jul 2023 10:56:11 -0700 Subject: [PATCH 212/667] Update 24 to 24.0.3 --- 24/cli/Dockerfile | 10 +++++----- 24/dind-rootless/Dockerfile | 4 ++-- 24/dind/Dockerfile | 8 ++++---- 24/windows/windowsservercore-1809/Dockerfile | 4 ++-- 24/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 140f05e9b..a38c1bbde 100644 --- a/24/cli/Dockerfile +++ b/24/cli/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 24.0.2 +ENV DOCKER_VERSION 24.0.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind-rootless/Dockerfile b/24/dind-rootless/Dockerfile index 73e3e9031..a692f60d8 100644 --- a/24/dind-rootless/Dockerfile +++ b/24/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-24.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index 504ec9f0b..d2c15cb83 100644 --- a/24/dind/Dockerfile +++ b/24/dind/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-24.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index afb1f14b9..7e3f9c113 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/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 24.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.2.zip +ENV DOCKER_VERSION 24.0.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.3.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/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index f935c87d1..1562c8ed1 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/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 24.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.2.zip +ENV DOCKER_VERSION 24.0.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.3.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/versions.json b/versions.json index aa8d0f0c8..c1013240e 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "24": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.3.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.2" + "version": "24.0.3" }, "24-rc": null } From 8becbdadcc71b5376c9ee193ca2740cd90549da5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 7 Jul 2023 14:23:59 -0700 Subject: [PATCH 213/667] Update 24 to 24.0.4 --- 24/cli/Dockerfile | 10 +++++----- 24/dind-rootless/Dockerfile | 4 ++-- 24/dind/Dockerfile | 8 ++++---- 24/windows/windowsservercore-1809/Dockerfile | 4 ++-- 24/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index a38c1bbde..669962aad 100644 --- a/24/cli/Dockerfile +++ b/24/cli/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 24.0.3 +ENV DOCKER_VERSION 24.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-24.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind-rootless/Dockerfile b/24/dind-rootless/Dockerfile index a692f60d8..9d2fb8492 100644 --- a/24/dind-rootless/Dockerfile +++ b/24/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-24.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index d2c15cb83..8cbee4df8 100644 --- a/24/dind/Dockerfile +++ b/24/dind/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-24.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 7e3f9c113..031330188 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/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 24.0.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.3.zip +ENV DOCKER_VERSION 24.0.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.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/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 1562c8ed1..476bafcc6 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/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 24.0.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.3.zip +ENV DOCKER_VERSION 24.0.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.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/versions.json b/versions.json index c1013240e..824e777fc 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "24": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.4.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.4.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.4.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.4.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.3.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.4.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.3" + "version": "24.0.4" }, "24-rc": null } From 7ea0f79f0aadfd3a48c321dfa9f0d0d2529ec163 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 11 Jul 2023 10:04:15 -0700 Subject: [PATCH 214/667] Update 23 to compose 2.20.0 --- 23/cli/Dockerfile | 30 ++++++------ 23/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index 3a675c548..227bcecd1 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.19.1 +ENV DOCKER_COMPOSE_VERSION 2.20.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-x86_64'; \ - sha256='8d3ecd3e48c598ba2e2d8eb3b59380f74c8c0c46259008fcd16d0dc058aaebd1'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-x86_64'; \ + sha256='b49e358d11c198fa228fb7eca2a177affd8e1e33e06d29940668668482f797cd'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv6'; \ - sha256='78639fa8323f0f60cd8b45a882bbb63cc630b44a7187e922195855cb64607d8f'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv6'; \ + sha256='72a0362081a268eb2410a4e57ec0df466ff2eb34e38ffb5552f9a6e58213758d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv7'; \ - sha256='bc9646ecf835e5e2665b7de6455c07cb21d4e892a4c212f9ca9f3024a26ff880'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv7'; \ + sha256='a5f181e83a78f5ab8c202f99713bc745712acbf387d9d2ce687c76e1ccdb36e2'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-aarch64'; \ - sha256='35db0e5207c66e002bfde3cab84e907aa7e552812803bebebf990487729eb2bf'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-aarch64'; \ + sha256='f82c5bc86cb0937628ae616087224aa7d02372d50e638eca646d5834c6766ee7'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-ppc64le'; \ - sha256='9c79eada1314e63734eb33e9d1815b5f494c357b45ac1c3ec035188ee616f215'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-ppc64le'; \ + sha256='2a8e638362cd3dc1f739b49066cf9f4d0d21e6e46f082d359c82c7d0c8081eee'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-riscv64'; \ - sha256='bcca185b3f1f2e6dbb392149f52676075b1e42ba64a3ed6508c2f9fc1b60c634'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-riscv64'; \ + sha256='5e5c89c6ce73d0f4aa1d01542fc287c97880d0ecb1766162c34b3a7b2852a50f'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-s390x'; \ - sha256='152e40b9f600b84223b8c2f217c45ed4813af8cdd98017cdcbdb35b81423f8d9'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-s390x'; \ + sha256='d58d6545d9d88f24a495199e4a438cf10351416b7655acda334e0e9e8448177c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index 6219add1c..a1d895cab 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.19.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed +ENV DOCKER_COMPOSE_VERSION 2.20.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index 3ce949272..a72a23dd6 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.19.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed +ENV DOCKER_COMPOSE_VERSION 2.20.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 824e777fc..b43e8c8ff 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "8d3ecd3e48c598ba2e2d8eb3b59380f74c8c0c46259008fcd16d0dc058aaebd1", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-x86_64" + "sha256": "b49e358d11c198fa228fb7eca2a177affd8e1e33e06d29940668668482f797cd", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "78639fa8323f0f60cd8b45a882bbb63cc630b44a7187e922195855cb64607d8f", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv6" + "sha256": "72a0362081a268eb2410a4e57ec0df466ff2eb34e38ffb5552f9a6e58213758d", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "bc9646ecf835e5e2665b7de6455c07cb21d4e892a4c212f9ca9f3024a26ff880", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv7" + "sha256": "a5f181e83a78f5ab8c202f99713bc745712acbf387d9d2ce687c76e1ccdb36e2", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "35db0e5207c66e002bfde3cab84e907aa7e552812803bebebf990487729eb2bf", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-aarch64" + "sha256": "f82c5bc86cb0937628ae616087224aa7d02372d50e638eca646d5834c6766ee7", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "056faeefeb5e0089e9295e2331ee6d8b352050286514c69f1bec9d2c12948e9b", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-darwin-x86_64" + "sha256": "8811c02ebf2e279be538a7a1acc1db0d2b3aff8dc331152719558070002c41b3", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5ecb092d8bf7ad463154edc2a7632c126519d989744c2f42b7ee7da5cbc06a77", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-darwin-aarch64" + "sha256": "bd07000409dfd47237368446153ecc06fc159184535c53423f60d6e8ba8631d8", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "9c79eada1314e63734eb33e9d1815b5f494c357b45ac1c3ec035188ee616f215", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-ppc64le" + "sha256": "2a8e638362cd3dc1f739b49066cf9f4d0d21e6e46f082d359c82c7d0c8081eee", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "bcca185b3f1f2e6dbb392149f52676075b1e42ba64a3ed6508c2f9fc1b60c634", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-riscv64" + "sha256": "5e5c89c6ce73d0f4aa1d01542fc287c97880d0ecb1766162c34b3a7b2852a50f", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "152e40b9f600b84223b8c2f217c45ed4813af8cdd98017cdcbdb35b81423f8d9", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-s390x" + "sha256": "d58d6545d9d88f24a495199e4a438cf10351416b7655acda334e0e9e8448177c", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe" + "sha256": "94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "8ecc1081e259517cfee322403d4e9382da743679da5737d7748a0130abdd3e53", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-aarch64.exe" + "sha256": "64cd7d89e5ae307183d373b5f3df57ebb4e0c6afd47487eda216e1e00a78450f", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.19.1" + "version": "2.20.0" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 241f88989640a4b60a49f76c72186294d8717c7e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 11 Jul 2023 10:05:55 -0700 Subject: [PATCH 215/667] Update 24 to compose 2.20.0 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 669962aad..5d83b7a2e 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.19.1 +ENV DOCKER_COMPOSE_VERSION 2.20.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-x86_64'; \ - sha256='8d3ecd3e48c598ba2e2d8eb3b59380f74c8c0c46259008fcd16d0dc058aaebd1'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-x86_64'; \ + sha256='b49e358d11c198fa228fb7eca2a177affd8e1e33e06d29940668668482f797cd'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv6'; \ - sha256='78639fa8323f0f60cd8b45a882bbb63cc630b44a7187e922195855cb64607d8f'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv6'; \ + sha256='72a0362081a268eb2410a4e57ec0df466ff2eb34e38ffb5552f9a6e58213758d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv7'; \ - sha256='bc9646ecf835e5e2665b7de6455c07cb21d4e892a4c212f9ca9f3024a26ff880'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv7'; \ + sha256='a5f181e83a78f5ab8c202f99713bc745712acbf387d9d2ce687c76e1ccdb36e2'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-aarch64'; \ - sha256='35db0e5207c66e002bfde3cab84e907aa7e552812803bebebf990487729eb2bf'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-aarch64'; \ + sha256='f82c5bc86cb0937628ae616087224aa7d02372d50e638eca646d5834c6766ee7'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-ppc64le'; \ - sha256='9c79eada1314e63734eb33e9d1815b5f494c357b45ac1c3ec035188ee616f215'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-ppc64le'; \ + sha256='2a8e638362cd3dc1f739b49066cf9f4d0d21e6e46f082d359c82c7d0c8081eee'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-riscv64'; \ - sha256='bcca185b3f1f2e6dbb392149f52676075b1e42ba64a3ed6508c2f9fc1b60c634'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-riscv64'; \ + sha256='5e5c89c6ce73d0f4aa1d01542fc287c97880d0ecb1766162c34b3a7b2852a50f'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-s390x'; \ - sha256='152e40b9f600b84223b8c2f217c45ed4813af8cdd98017cdcbdb35b81423f8d9'; \ + url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-s390x'; \ + sha256='d58d6545d9d88f24a495199e4a438cf10351416b7655acda334e0e9e8448177c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 031330188..b0f60d9af 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.19.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed +ENV DOCKER_COMPOSE_VERSION 2.20.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 476bafcc6..1372271b9 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.19.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed +ENV DOCKER_COMPOSE_VERSION 2.20.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b43e8c8ff..400da50fe 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "8d3ecd3e48c598ba2e2d8eb3b59380f74c8c0c46259008fcd16d0dc058aaebd1", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-x86_64" + "sha256": "b49e358d11c198fa228fb7eca2a177affd8e1e33e06d29940668668482f797cd", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "78639fa8323f0f60cd8b45a882bbb63cc630b44a7187e922195855cb64607d8f", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv6" + "sha256": "72a0362081a268eb2410a4e57ec0df466ff2eb34e38ffb5552f9a6e58213758d", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "bc9646ecf835e5e2665b7de6455c07cb21d4e892a4c212f9ca9f3024a26ff880", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-armv7" + "sha256": "a5f181e83a78f5ab8c202f99713bc745712acbf387d9d2ce687c76e1ccdb36e2", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "35db0e5207c66e002bfde3cab84e907aa7e552812803bebebf990487729eb2bf", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-aarch64" + "sha256": "f82c5bc86cb0937628ae616087224aa7d02372d50e638eca646d5834c6766ee7", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "056faeefeb5e0089e9295e2331ee6d8b352050286514c69f1bec9d2c12948e9b", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-darwin-x86_64" + "sha256": "8811c02ebf2e279be538a7a1acc1db0d2b3aff8dc331152719558070002c41b3", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5ecb092d8bf7ad463154edc2a7632c126519d989744c2f42b7ee7da5cbc06a77", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-darwin-aarch64" + "sha256": "bd07000409dfd47237368446153ecc06fc159184535c53423f60d6e8ba8631d8", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "9c79eada1314e63734eb33e9d1815b5f494c357b45ac1c3ec035188ee616f215", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-ppc64le" + "sha256": "2a8e638362cd3dc1f739b49066cf9f4d0d21e6e46f082d359c82c7d0c8081eee", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "bcca185b3f1f2e6dbb392149f52676075b1e42ba64a3ed6508c2f9fc1b60c634", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-riscv64" + "sha256": "5e5c89c6ce73d0f4aa1d01542fc287c97880d0ecb1766162c34b3a7b2852a50f", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "152e40b9f600b84223b8c2f217c45ed4813af8cdd98017cdcbdb35b81423f8d9", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-linux-s390x" + "sha256": "d58d6545d9d88f24a495199e4a438cf10351416b7655acda334e0e9e8448177c", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e77e4764e939782d27570fc17a6029b63fe922ebce6800128dfe1c047a9395ed", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-x86_64.exe" + "sha256": "94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "8ecc1081e259517cfee322403d4e9382da743679da5737d7748a0130abdd3e53", - "url": "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-windows-aarch64.exe" + "sha256": "64cd7d89e5ae307183d373b5f3df57ebb4e0c6afd47487eda216e1e00a78450f", + "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.19.1" + "version": "2.20.0" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 2092c28b92a35aa7694a34cc4d0d6afa8226dffe Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Jul 2023 10:04:16 -0700 Subject: [PATCH 216/667] Update 23 to buildx 0.11.2 --- 23/cli/Dockerfile | 30 +++++----- 23/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index 227bcecd1..eb8c46449 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -51,38 +51,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.11.1 +ENV DOCKER_BUILDX_VERSION 0.11.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-amd64'; \ - sha256='34927047282ef9052f57809fe94783b2dc0ab556fdd60c2c0b7f4e6e5f05a53b'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64'; \ + sha256='311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v6'; \ - sha256='ec7b60a4946c7c0fdaa3a44590adc08a0ead0ecca860358c57ca62d3e9a3a0be'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6'; \ + sha256='c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v7'; \ - sha256='d122ec20622a744419fea021fd4850edc56d816b5cbc746d1f90184dbc227fec'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7'; \ + sha256='4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm64'; \ - sha256='1649de43c6477eb8bf615f0817932e69e500ce530422bed47c9f3a689baeb788'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64'; \ + sha256='565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-ppc64le'; \ - sha256='78cfc6cdb3982770ce4e922e62c42ee0750b4b2837349661d20834356f004d16'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le'; \ + sha256='c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-riscv64'; \ - sha256='1d932a0925e9aee66c85cb7a351e9dbd210294ccb8d01208bf953108ad321f4d'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64'; \ + sha256='c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-s390x'; \ - sha256='89466f278264f597d3c81e5230ab5795b2578ad62d2c7e8f8be398546e02c3d7'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x'; \ + sha256='02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index a1d895cab..d69a7cc8d 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30 +ENV DOCKER_BUILDX_VERSION 0.11.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index a72a23dd6..c0bef8e3f 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30 +ENV DOCKER_BUILDX_VERSION 0.11.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 400da50fe..0b8334fa4 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.11.1.linux-amd64", - "sha256": "34927047282ef9052f57809fe94783b2dc0ab556fdd60c2c0b7f4e6e5f05a53b", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-amd64" + "file": "buildx-v0.11.2.linux-amd64", + "sha256": "311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.11.1.linux-arm-v6", - "sha256": "ec7b60a4946c7c0fdaa3a44590adc08a0ead0ecca860358c57ca62d3e9a3a0be", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v6" + "file": "buildx-v0.11.2.linux-arm-v6", + "sha256": "c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.11.1.linux-arm-v7", - "sha256": "d122ec20622a744419fea021fd4850edc56d816b5cbc746d1f90184dbc227fec", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v7" + "file": "buildx-v0.11.2.linux-arm-v7", + "sha256": "4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.11.1.linux-arm64", - "sha256": "1649de43c6477eb8bf615f0817932e69e500ce530422bed47c9f3a689baeb788", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm64" + "file": "buildx-v0.11.2.linux-arm64", + "sha256": "565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.11.1.linux-ppc64le", - "sha256": "78cfc6cdb3982770ce4e922e62c42ee0750b4b2837349661d20834356f004d16", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-ppc64le" + "file": "buildx-v0.11.2.linux-ppc64le", + "sha256": "c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.11.1.linux-riscv64", - "sha256": "1d932a0925e9aee66c85cb7a351e9dbd210294ccb8d01208bf953108ad321f4d", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-riscv64" + "file": "buildx-v0.11.2.linux-riscv64", + "sha256": "c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.11.1.linux-s390x", - "sha256": "89466f278264f597d3c81e5230ab5795b2578ad62d2c7e8f8be398546e02c3d7", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-s390x" + "file": "buildx-v0.11.2.linux-s390x", + "sha256": "02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.11.1.windows-amd64.exe", - "sha256": "ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe" + "file": "buildx-v0.11.2.windows-amd64.exe", + "sha256": "d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.11.1.windows-arm64.exe", - "sha256": "17841db6529e5ba64e42082bb1f6760db522220f996892fe0ee6c2220d2ea020", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-arm64.exe" + "file": "buildx-v0.11.2.windows-arm64.exe", + "sha256": "9278cb193ca5d508ff632416c07712a7d128349a1b2ede3085456758e2f90d3f", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-arm64.exe" } }, - "version": "0.11.1" + "version": "0.11.2" }, "compose": { "arches": { From be829cf1871102bee1a2399603abca44ed93e9df Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Jul 2023 10:06:00 -0700 Subject: [PATCH 217/667] Update 24 to buildx 0.11.2 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 5d83b7a2e..78b8bb257 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -51,38 +51,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.11.1 +ENV DOCKER_BUILDX_VERSION 0.11.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-amd64'; \ - sha256='34927047282ef9052f57809fe94783b2dc0ab556fdd60c2c0b7f4e6e5f05a53b'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64'; \ + sha256='311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v6'; \ - sha256='ec7b60a4946c7c0fdaa3a44590adc08a0ead0ecca860358c57ca62d3e9a3a0be'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6'; \ + sha256='c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v7'; \ - sha256='d122ec20622a744419fea021fd4850edc56d816b5cbc746d1f90184dbc227fec'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7'; \ + sha256='4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm64'; \ - sha256='1649de43c6477eb8bf615f0817932e69e500ce530422bed47c9f3a689baeb788'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64'; \ + sha256='565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-ppc64le'; \ - sha256='78cfc6cdb3982770ce4e922e62c42ee0750b4b2837349661d20834356f004d16'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le'; \ + sha256='c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-riscv64'; \ - sha256='1d932a0925e9aee66c85cb7a351e9dbd210294ccb8d01208bf953108ad321f4d'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64'; \ + sha256='c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-s390x'; \ - sha256='89466f278264f597d3c81e5230ab5795b2578ad62d2c7e8f8be398546e02c3d7'; \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x'; \ + sha256='02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index b0f60d9af..21c53811b 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30 +ENV DOCKER_BUILDX_VERSION 0.11.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 1372271b9..48e95e92b 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30 +ENV DOCKER_BUILDX_VERSION 0.11.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 0b8334fa4..2b12e474c 100644 --- a/versions.json +++ b/versions.json @@ -164,52 +164,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.11.1.linux-amd64", - "sha256": "34927047282ef9052f57809fe94783b2dc0ab556fdd60c2c0b7f4e6e5f05a53b", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-amd64" + "file": "buildx-v0.11.2.linux-amd64", + "sha256": "311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.11.1.linux-arm-v6", - "sha256": "ec7b60a4946c7c0fdaa3a44590adc08a0ead0ecca860358c57ca62d3e9a3a0be", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v6" + "file": "buildx-v0.11.2.linux-arm-v6", + "sha256": "c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.11.1.linux-arm-v7", - "sha256": "d122ec20622a744419fea021fd4850edc56d816b5cbc746d1f90184dbc227fec", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm-v7" + "file": "buildx-v0.11.2.linux-arm-v7", + "sha256": "4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.11.1.linux-arm64", - "sha256": "1649de43c6477eb8bf615f0817932e69e500ce530422bed47c9f3a689baeb788", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-arm64" + "file": "buildx-v0.11.2.linux-arm64", + "sha256": "565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.11.1.linux-ppc64le", - "sha256": "78cfc6cdb3982770ce4e922e62c42ee0750b4b2837349661d20834356f004d16", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-ppc64le" + "file": "buildx-v0.11.2.linux-ppc64le", + "sha256": "c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.11.1.linux-riscv64", - "sha256": "1d932a0925e9aee66c85cb7a351e9dbd210294ccb8d01208bf953108ad321f4d", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-riscv64" + "file": "buildx-v0.11.2.linux-riscv64", + "sha256": "c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.11.1.linux-s390x", - "sha256": "89466f278264f597d3c81e5230ab5795b2578ad62d2c7e8f8be398546e02c3d7", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.linux-s390x" + "file": "buildx-v0.11.2.linux-s390x", + "sha256": "02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.11.1.windows-amd64.exe", - "sha256": "ed04052b2742e0a2e45a02c87ec4f782b8c7914f56a5d3e1bb39ff9ab8687f30", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-amd64.exe" + "file": "buildx-v0.11.2.windows-amd64.exe", + "sha256": "d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.11.1.windows-arm64.exe", - "sha256": "17841db6529e5ba64e42082bb1f6760db522220f996892fe0ee6c2220d2ea020", - "url": "https://github.com/docker/buildx/releases/download/v0.11.1/buildx-v0.11.1.windows-arm64.exe" + "file": "buildx-v0.11.2.windows-arm64.exe", + "sha256": "9278cb193ca5d508ff632416c07712a7d128349a1b2ede3085456758e2f90d3f", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-arm64.exe" } }, - "version": "0.11.1" + "version": "0.11.2" }, "compose": { "arches": { From 0e2f0bff4c321c391633eb2407d07d804975e203 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Jul 2023 16:04:14 -0700 Subject: [PATCH 218/667] Update 23 to compose 2.20.1 --- 23/cli/Dockerfile | 30 ++++++------ 23/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index eb8c46449..86a790eec 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.20.0 +ENV DOCKER_COMPOSE_VERSION 2.20.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-x86_64'; \ - sha256='b49e358d11c198fa228fb7eca2a177affd8e1e33e06d29940668668482f797cd'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-x86_64'; \ + sha256='804aa825c58b375901ba9dc9d0aa1648ce305d903a58f2a5c42bb5c6873b02bf'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv6'; \ - sha256='72a0362081a268eb2410a4e57ec0df466ff2eb34e38ffb5552f9a6e58213758d'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv6'; \ + sha256='4c205d2936620bf755135e6aad7133017dd515e5610b641289bbcf061e50dab7'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv7'; \ - sha256='a5f181e83a78f5ab8c202f99713bc745712acbf387d9d2ce687c76e1ccdb36e2'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv7'; \ + sha256='6e6deec5284d56f38c927269ea79db947445ec262b3494f96f267951f37f70ef'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-aarch64'; \ - sha256='f82c5bc86cb0937628ae616087224aa7d02372d50e638eca646d5834c6766ee7'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-aarch64'; \ + sha256='d6edfe561d64a6948a087ff20a29ce9abfca0f1df11ef1b79dfe4910c9f88e4b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-ppc64le'; \ - sha256='2a8e638362cd3dc1f739b49066cf9f4d0d21e6e46f082d359c82c7d0c8081eee'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-ppc64le'; \ + sha256='079b61b877941f3949590d7d33ccda94bbbf8646000fa7d729380abf8ce3df03'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-riscv64'; \ - sha256='5e5c89c6ce73d0f4aa1d01542fc287c97880d0ecb1766162c34b3a7b2852a50f'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-riscv64'; \ + sha256='a93546718531b11c2c565684bfc365c4cf6c00a8d862b12178419ee28b4dade8'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-s390x'; \ - sha256='d58d6545d9d88f24a495199e4a438cf10351416b7655acda334e0e9e8448177c'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-s390x'; \ + sha256='a080258e0155b3e14cf8c76cc2255aa6365edd35f942b4c6bb5da7b2278bdeb5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index d69a7cc8d..72fcaeaad 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6 +ENV DOCKER_COMPOSE_VERSION 2.20.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index c0bef8e3f..44d93d7d0 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6 +ENV DOCKER_COMPOSE_VERSION 2.20.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 2b12e474c..9778acc68 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "b49e358d11c198fa228fb7eca2a177affd8e1e33e06d29940668668482f797cd", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-x86_64" + "sha256": "804aa825c58b375901ba9dc9d0aa1648ce305d903a58f2a5c42bb5c6873b02bf", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "72a0362081a268eb2410a4e57ec0df466ff2eb34e38ffb5552f9a6e58213758d", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv6" + "sha256": "4c205d2936620bf755135e6aad7133017dd515e5610b641289bbcf061e50dab7", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "a5f181e83a78f5ab8c202f99713bc745712acbf387d9d2ce687c76e1ccdb36e2", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv7" + "sha256": "6e6deec5284d56f38c927269ea79db947445ec262b3494f96f267951f37f70ef", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "f82c5bc86cb0937628ae616087224aa7d02372d50e638eca646d5834c6766ee7", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-aarch64" + "sha256": "d6edfe561d64a6948a087ff20a29ce9abfca0f1df11ef1b79dfe4910c9f88e4b", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "8811c02ebf2e279be538a7a1acc1db0d2b3aff8dc331152719558070002c41b3", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-darwin-x86_64" + "sha256": "9f20a3e9df250762d3b5ff069d3f7af5e388c1ad3b71c18055f18f7f8e00827c", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "bd07000409dfd47237368446153ecc06fc159184535c53423f60d6e8ba8631d8", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-darwin-aarch64" + "sha256": "e5449e23d14740092c4e764dd9e66cc693d8b02747167c045fd4edfd64fda958", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "2a8e638362cd3dc1f739b49066cf9f4d0d21e6e46f082d359c82c7d0c8081eee", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-ppc64le" + "sha256": "079b61b877941f3949590d7d33ccda94bbbf8646000fa7d729380abf8ce3df03", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "5e5c89c6ce73d0f4aa1d01542fc287c97880d0ecb1766162c34b3a7b2852a50f", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-riscv64" + "sha256": "a93546718531b11c2c565684bfc365c4cf6c00a8d862b12178419ee28b4dade8", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "d58d6545d9d88f24a495199e4a438cf10351416b7655acda334e0e9e8448177c", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-s390x" + "sha256": "a080258e0155b3e14cf8c76cc2255aa6365edd35f942b4c6bb5da7b2278bdeb5", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe" + "sha256": "7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "64cd7d89e5ae307183d373b5f3df57ebb4e0c6afd47487eda216e1e00a78450f", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-aarch64.exe" + "sha256": "269ac1acb6f53847395266e0a871e4da8e7f3de89f86e37f17b7d966c2731524", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.20.0" + "version": "2.20.1" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 093acb6656bd81662d2ee166cc79ba7ea79ff259 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Jul 2023 16:05:41 -0700 Subject: [PATCH 219/667] Update 24 to compose 2.20.1 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 78b8bb257..305a474e6 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.20.0 +ENV DOCKER_COMPOSE_VERSION 2.20.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-x86_64'; \ - sha256='b49e358d11c198fa228fb7eca2a177affd8e1e33e06d29940668668482f797cd'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-x86_64'; \ + sha256='804aa825c58b375901ba9dc9d0aa1648ce305d903a58f2a5c42bb5c6873b02bf'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv6'; \ - sha256='72a0362081a268eb2410a4e57ec0df466ff2eb34e38ffb5552f9a6e58213758d'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv6'; \ + sha256='4c205d2936620bf755135e6aad7133017dd515e5610b641289bbcf061e50dab7'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv7'; \ - sha256='a5f181e83a78f5ab8c202f99713bc745712acbf387d9d2ce687c76e1ccdb36e2'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv7'; \ + sha256='6e6deec5284d56f38c927269ea79db947445ec262b3494f96f267951f37f70ef'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-aarch64'; \ - sha256='f82c5bc86cb0937628ae616087224aa7d02372d50e638eca646d5834c6766ee7'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-aarch64'; \ + sha256='d6edfe561d64a6948a087ff20a29ce9abfca0f1df11ef1b79dfe4910c9f88e4b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-ppc64le'; \ - sha256='2a8e638362cd3dc1f739b49066cf9f4d0d21e6e46f082d359c82c7d0c8081eee'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-ppc64le'; \ + sha256='079b61b877941f3949590d7d33ccda94bbbf8646000fa7d729380abf8ce3df03'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-riscv64'; \ - sha256='5e5c89c6ce73d0f4aa1d01542fc287c97880d0ecb1766162c34b3a7b2852a50f'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-riscv64'; \ + sha256='a93546718531b11c2c565684bfc365c4cf6c00a8d862b12178419ee28b4dade8'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-s390x'; \ - sha256='d58d6545d9d88f24a495199e4a438cf10351416b7655acda334e0e9e8448177c'; \ + url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-s390x'; \ + sha256='a080258e0155b3e14cf8c76cc2255aa6365edd35f942b4c6bb5da7b2278bdeb5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 21c53811b..bcb9e9ec1 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6 +ENV DOCKER_COMPOSE_VERSION 2.20.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 48e95e92b..04e8669fd 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6 +ENV DOCKER_COMPOSE_VERSION 2.20.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 9778acc68..2cbef1bce 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "b49e358d11c198fa228fb7eca2a177affd8e1e33e06d29940668668482f797cd", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-x86_64" + "sha256": "804aa825c58b375901ba9dc9d0aa1648ce305d903a58f2a5c42bb5c6873b02bf", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "72a0362081a268eb2410a4e57ec0df466ff2eb34e38ffb5552f9a6e58213758d", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv6" + "sha256": "4c205d2936620bf755135e6aad7133017dd515e5610b641289bbcf061e50dab7", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "a5f181e83a78f5ab8c202f99713bc745712acbf387d9d2ce687c76e1ccdb36e2", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-armv7" + "sha256": "6e6deec5284d56f38c927269ea79db947445ec262b3494f96f267951f37f70ef", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "f82c5bc86cb0937628ae616087224aa7d02372d50e638eca646d5834c6766ee7", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-aarch64" + "sha256": "d6edfe561d64a6948a087ff20a29ce9abfca0f1df11ef1b79dfe4910c9f88e4b", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "8811c02ebf2e279be538a7a1acc1db0d2b3aff8dc331152719558070002c41b3", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-darwin-x86_64" + "sha256": "9f20a3e9df250762d3b5ff069d3f7af5e388c1ad3b71c18055f18f7f8e00827c", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "bd07000409dfd47237368446153ecc06fc159184535c53423f60d6e8ba8631d8", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-darwin-aarch64" + "sha256": "e5449e23d14740092c4e764dd9e66cc693d8b02747167c045fd4edfd64fda958", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "2a8e638362cd3dc1f739b49066cf9f4d0d21e6e46f082d359c82c7d0c8081eee", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-ppc64le" + "sha256": "079b61b877941f3949590d7d33ccda94bbbf8646000fa7d729380abf8ce3df03", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "5e5c89c6ce73d0f4aa1d01542fc287c97880d0ecb1766162c34b3a7b2852a50f", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-riscv64" + "sha256": "a93546718531b11c2c565684bfc365c4cf6c00a8d862b12178419ee28b4dade8", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "d58d6545d9d88f24a495199e4a438cf10351416b7655acda334e0e9e8448177c", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-linux-s390x" + "sha256": "a080258e0155b3e14cf8c76cc2255aa6365edd35f942b4c6bb5da7b2278bdeb5", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "94ae3b1302faf173ccd1cdc3556bd150f90780ff94cdf6e704a8302a75574da6", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-x86_64.exe" + "sha256": "7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "64cd7d89e5ae307183d373b5f3df57ebb4e0c6afd47487eda216e1e00a78450f", - "url": "https://github.com/docker/compose/releases/download/v2.20.0/docker-compose-windows-aarch64.exe" + "sha256": "269ac1acb6f53847395266e0a871e4da8e7f3de89f86e37f17b7d966c2731524", + "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.20.0" + "version": "2.20.1" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From cb48c20d320555c4486a1211b485ccf1f100a829 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 19 Jul 2023 10:04:16 -0700 Subject: [PATCH 220/667] Update 23 to compose 2.20.2 --- 23/cli/Dockerfile | 30 ++++++------ 23/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index 86a790eec..60b83ee2a 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.20.1 +ENV DOCKER_COMPOSE_VERSION 2.20.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-x86_64'; \ - sha256='804aa825c58b375901ba9dc9d0aa1648ce305d903a58f2a5c42bb5c6873b02bf'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-x86_64'; \ + sha256='b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv6'; \ - sha256='4c205d2936620bf755135e6aad7133017dd515e5610b641289bbcf061e50dab7'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv6'; \ + sha256='39cef332454d1c7a26e12f8d9ee297908d1da9cb71112ede1816c550766ddb8e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv7'; \ - sha256='6e6deec5284d56f38c927269ea79db947445ec262b3494f96f267951f37f70ef'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv7'; \ + sha256='139275f3453761b46f0837a4e4c2a00883b778abee997e299c52e1bcf3d8fc9f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-aarch64'; \ - sha256='d6edfe561d64a6948a087ff20a29ce9abfca0f1df11ef1b79dfe4910c9f88e4b'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-aarch64'; \ + sha256='e63a24e57d2104a09b37ee6aa04c76f4ae85bdf7a59e1bf79adc6d5f55340a31'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-ppc64le'; \ - sha256='079b61b877941f3949590d7d33ccda94bbbf8646000fa7d729380abf8ce3df03'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-ppc64le'; \ + sha256='9c08eb875a7ffd4a832a585540a4c9c81da5dcab263ec3e704ab1d62b573636f'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-riscv64'; \ - sha256='a93546718531b11c2c565684bfc365c4cf6c00a8d862b12178419ee28b4dade8'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-riscv64'; \ + sha256='5a3bff32ecf0a5a38a83afeb3dc2effd8ca3d52eb2e07ec000334663d493055b'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-s390x'; \ - sha256='a080258e0155b3e14cf8c76cc2255aa6365edd35f942b4c6bb5da7b2278bdeb5'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-s390x'; \ + sha256='297be6a0ece070ae95d5caf91a23b89dc1b2563e928db80eee480d7018919ee6'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index 72fcaeaad..4f45a9556 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497 +ENV DOCKER_COMPOSE_VERSION 2.20.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index 44d93d7d0..069804caa 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497 +ENV DOCKER_COMPOSE_VERSION 2.20.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 2cbef1bce..1645949f5 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "804aa825c58b375901ba9dc9d0aa1648ce305d903a58f2a5c42bb5c6873b02bf", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-x86_64" + "sha256": "b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4c205d2936620bf755135e6aad7133017dd515e5610b641289bbcf061e50dab7", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv6" + "sha256": "39cef332454d1c7a26e12f8d9ee297908d1da9cb71112ede1816c550766ddb8e", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "6e6deec5284d56f38c927269ea79db947445ec262b3494f96f267951f37f70ef", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv7" + "sha256": "139275f3453761b46f0837a4e4c2a00883b778abee997e299c52e1bcf3d8fc9f", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d6edfe561d64a6948a087ff20a29ce9abfca0f1df11ef1b79dfe4910c9f88e4b", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-aarch64" + "sha256": "e63a24e57d2104a09b37ee6aa04c76f4ae85bdf7a59e1bf79adc6d5f55340a31", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9f20a3e9df250762d3b5ff069d3f7af5e388c1ad3b71c18055f18f7f8e00827c", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-darwin-x86_64" + "sha256": "efe6b9901d7ee203a3d56c52a755f31a1022085cec12fcd84bbbc6b996780ef3", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "e5449e23d14740092c4e764dd9e66cc693d8b02747167c045fd4edfd64fda958", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-darwin-aarch64" + "sha256": "162aafb7b1dd39ef2398d0bb816d4b329884285f64a00d69a7c6bedc51cc5ddb", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "079b61b877941f3949590d7d33ccda94bbbf8646000fa7d729380abf8ce3df03", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-ppc64le" + "sha256": "9c08eb875a7ffd4a832a585540a4c9c81da5dcab263ec3e704ab1d62b573636f", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "a93546718531b11c2c565684bfc365c4cf6c00a8d862b12178419ee28b4dade8", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-riscv64" + "sha256": "5a3bff32ecf0a5a38a83afeb3dc2effd8ca3d52eb2e07ec000334663d493055b", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "a080258e0155b3e14cf8c76cc2255aa6365edd35f942b4c6bb5da7b2278bdeb5", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-s390x" + "sha256": "297be6a0ece070ae95d5caf91a23b89dc1b2563e928db80eee480d7018919ee6", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe" + "sha256": "d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "269ac1acb6f53847395266e0a871e4da8e7f3de89f86e37f17b7d966c2731524", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-aarch64.exe" + "sha256": "7f89a26e6b7af7b1d63901db2798d2dad0d56b6b3512828705fc8caada210236", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.20.1" + "version": "2.20.2" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 074561445e7929ca4e69233bdf382ac2ce81789f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 19 Jul 2023 10:05:42 -0700 Subject: [PATCH 221/667] Update 24 to compose 2.20.2 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 305a474e6..f230b95f6 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.20.1 +ENV DOCKER_COMPOSE_VERSION 2.20.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-x86_64'; \ - sha256='804aa825c58b375901ba9dc9d0aa1648ce305d903a58f2a5c42bb5c6873b02bf'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-x86_64'; \ + sha256='b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv6'; \ - sha256='4c205d2936620bf755135e6aad7133017dd515e5610b641289bbcf061e50dab7'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv6'; \ + sha256='39cef332454d1c7a26e12f8d9ee297908d1da9cb71112ede1816c550766ddb8e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv7'; \ - sha256='6e6deec5284d56f38c927269ea79db947445ec262b3494f96f267951f37f70ef'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv7'; \ + sha256='139275f3453761b46f0837a4e4c2a00883b778abee997e299c52e1bcf3d8fc9f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-aarch64'; \ - sha256='d6edfe561d64a6948a087ff20a29ce9abfca0f1df11ef1b79dfe4910c9f88e4b'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-aarch64'; \ + sha256='e63a24e57d2104a09b37ee6aa04c76f4ae85bdf7a59e1bf79adc6d5f55340a31'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-ppc64le'; \ - sha256='079b61b877941f3949590d7d33ccda94bbbf8646000fa7d729380abf8ce3df03'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-ppc64le'; \ + sha256='9c08eb875a7ffd4a832a585540a4c9c81da5dcab263ec3e704ab1d62b573636f'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-riscv64'; \ - sha256='a93546718531b11c2c565684bfc365c4cf6c00a8d862b12178419ee28b4dade8'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-riscv64'; \ + sha256='5a3bff32ecf0a5a38a83afeb3dc2effd8ca3d52eb2e07ec000334663d493055b'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-s390x'; \ - sha256='a080258e0155b3e14cf8c76cc2255aa6365edd35f942b4c6bb5da7b2278bdeb5'; \ + url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-s390x'; \ + sha256='297be6a0ece070ae95d5caf91a23b89dc1b2563e928db80eee480d7018919ee6'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index bcb9e9ec1..8d952e326 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497 +ENV DOCKER_COMPOSE_VERSION 2.20.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 04e8669fd..277aafc03 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497 +ENV DOCKER_COMPOSE_VERSION 2.20.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 1645949f5..39d628187 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "804aa825c58b375901ba9dc9d0aa1648ce305d903a58f2a5c42bb5c6873b02bf", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-x86_64" + "sha256": "b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4c205d2936620bf755135e6aad7133017dd515e5610b641289bbcf061e50dab7", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv6" + "sha256": "39cef332454d1c7a26e12f8d9ee297908d1da9cb71112ede1816c550766ddb8e", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "6e6deec5284d56f38c927269ea79db947445ec262b3494f96f267951f37f70ef", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-armv7" + "sha256": "139275f3453761b46f0837a4e4c2a00883b778abee997e299c52e1bcf3d8fc9f", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d6edfe561d64a6948a087ff20a29ce9abfca0f1df11ef1b79dfe4910c9f88e4b", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-aarch64" + "sha256": "e63a24e57d2104a09b37ee6aa04c76f4ae85bdf7a59e1bf79adc6d5f55340a31", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9f20a3e9df250762d3b5ff069d3f7af5e388c1ad3b71c18055f18f7f8e00827c", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-darwin-x86_64" + "sha256": "efe6b9901d7ee203a3d56c52a755f31a1022085cec12fcd84bbbc6b996780ef3", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "e5449e23d14740092c4e764dd9e66cc693d8b02747167c045fd4edfd64fda958", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-darwin-aarch64" + "sha256": "162aafb7b1dd39ef2398d0bb816d4b329884285f64a00d69a7c6bedc51cc5ddb", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "079b61b877941f3949590d7d33ccda94bbbf8646000fa7d729380abf8ce3df03", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-ppc64le" + "sha256": "9c08eb875a7ffd4a832a585540a4c9c81da5dcab263ec3e704ab1d62b573636f", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "a93546718531b11c2c565684bfc365c4cf6c00a8d862b12178419ee28b4dade8", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-riscv64" + "sha256": "5a3bff32ecf0a5a38a83afeb3dc2effd8ca3d52eb2e07ec000334663d493055b", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "a080258e0155b3e14cf8c76cc2255aa6365edd35f942b4c6bb5da7b2278bdeb5", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-linux-s390x" + "sha256": "297be6a0ece070ae95d5caf91a23b89dc1b2563e928db80eee480d7018919ee6", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7e6f1f0e5fadd6f834de067f4e321560eb1b6465dff62f59cffe36a23a300497", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-x86_64.exe" + "sha256": "d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "269ac1acb6f53847395266e0a871e4da8e7f3de89f86e37f17b7d966c2731524", - "url": "https://github.com/docker/compose/releases/download/v2.20.1/docker-compose-windows-aarch64.exe" + "sha256": "7f89a26e6b7af7b1d63901db2798d2dad0d56b6b3512828705fc8caada210236", + "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.20.1" + "version": "2.20.2" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 71d9cf51bf3c9359c4e84680e77dc1a80bd291f0 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Wed, 19 Jul 2023 13:26:12 -0700 Subject: [PATCH 222/667] Add minor GHA improvements See docker-library/bashbrew#77 --- .github/workflows/ci.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3860c115c..60de55976 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ name: GitHub CI on: pull_request: push: + workflow_dispatch: schedule: - cron: 0 0 * * 0 @@ -10,6 +11,10 @@ defaults: run: shell: 'bash -Eeuo pipefail -x {0}' +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + jobs: generate-jobs: @@ -24,8 +29,11 @@ jobs: name: Generate Jobs run: | strategy="$("$BASHBREW_SCRIPTS/github-actions/generate.sh")" - echo "strategy=$strategy" >> "$GITHUB_OUTPUT" - jq . <<<"$strategy" # sanity check / debugging aid + + EOF="EOF-$RANDOM-$RANDOM-$RANDOM" + echo "strategy<<$EOF" >> "$GITHUB_OUTPUT" + jq <<<"$strategy" . | tee -a "$GITHUB_OUTPUT" + echo "$EOF" >> "$GITHUB_OUTPUT" test: needs: generate-jobs From f6bb49f0c0e7ed0ab489df14b53e26cc65c294d6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 24 Jul 2023 09:17:39 -0700 Subject: [PATCH 223/667] Update 24 to 24.0.5 --- 24/cli/Dockerfile | 10 +++++----- 24/dind-rootless/Dockerfile | 4 ++-- 24/dind/Dockerfile | 8 ++++---- 24/windows/windowsservercore-1809/Dockerfile | 4 ++-- 24/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index f230b95f6..c6163c724 100644 --- a/24/cli/Dockerfile +++ b/24/cli/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 24.0.4 +ENV DOCKER_VERSION 24.0.5 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.5.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.5.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind-rootless/Dockerfile b/24/dind-rootless/Dockerfile index 9d2fb8492..4a7d1c94e 100644 --- a/24/dind-rootless/Dockerfile +++ b/24/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-24.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index 8cbee4df8..d5d20698e 100644 --- a/24/dind/Dockerfile +++ b/24/dind/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-24.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.5.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.5.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 8d952e326..5a542b4f5 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/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 24.0.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.4.zip +ENV DOCKER_VERSION 24.0.5 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.5.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/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 277aafc03..92eaa9e30 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/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 24.0.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.4.zip +ENV DOCKER_VERSION 24.0.5 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.5.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/versions.json b/versions.json index 39d628187..98727f5c4 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "24": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.5.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.5.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.5.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.5.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.5.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.5.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.4.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.5.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.4" + "version": "24.0.5" }, "24-rc": null } From e0434f3ab21e20772dfbcd513fe93e32b405560a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 11 Aug 2023 04:04:13 -0700 Subject: [PATCH 224/667] Update 23 to compose 2.20.3 --- 23/cli/Dockerfile | 30 ++++++------ 23/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index 60b83ee2a..f9ec2fdae 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.20.2 +ENV DOCKER_COMPOSE_VERSION 2.20.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-x86_64'; \ - sha256='b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64'; \ + sha256='f45e4cb687df8b48a57f656097ce7175fa8e8bef70be407b011e29ff663f475f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv6'; \ - sha256='39cef332454d1c7a26e12f8d9ee297908d1da9cb71112ede1816c550766ddb8e'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv6'; \ + sha256='e2010f160f5077c6d4d777965d21147328dbfb29894e60a5fbbce716284fd3cf'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv7'; \ - sha256='139275f3453761b46f0837a4e4c2a00883b778abee997e299c52e1bcf3d8fc9f'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv7'; \ + sha256='f62e5fb2e1908152c5f3e250faa2057c3d3351207eedd4c042ff540bba5f7575'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-aarch64'; \ - sha256='e63a24e57d2104a09b37ee6aa04c76f4ae85bdf7a59e1bf79adc6d5f55340a31'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-aarch64'; \ + sha256='9d6a6396b7604a390977ffff78379090f7c6910160bbd3b9669e2fcc635633c5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-ppc64le'; \ - sha256='9c08eb875a7ffd4a832a585540a4c9c81da5dcab263ec3e704ab1d62b573636f'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-ppc64le'; \ + sha256='463d3d220da0fe49c40605a1fc9e4ed7414f47c0ac028c80c55d2e758e99d7ee'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-riscv64'; \ - sha256='5a3bff32ecf0a5a38a83afeb3dc2effd8ca3d52eb2e07ec000334663d493055b'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-riscv64'; \ + sha256='03b0ec338482f61593074b62ffab482ae67ecdc5d868eb72bb8fe3f8a7680c91'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-s390x'; \ - sha256='297be6a0ece070ae95d5caf91a23b89dc1b2563e928db80eee480d7018919ee6'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-s390x'; \ + sha256='3b24ddd85e859757801a8b9a7e53b96882fa5fd18cc12ee8750770f43b6afa14'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index 4f45a9556..b56a6f1b5 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a +ENV DOCKER_COMPOSE_VERSION 2.20.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index 069804caa..a4a2d78aa 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a +ENV DOCKER_COMPOSE_VERSION 2.20.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 98727f5c4..b1eb80672 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-x86_64" + "sha256": "f45e4cb687df8b48a57f656097ce7175fa8e8bef70be407b011e29ff663f475f", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "39cef332454d1c7a26e12f8d9ee297908d1da9cb71112ede1816c550766ddb8e", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv6" + "sha256": "e2010f160f5077c6d4d777965d21147328dbfb29894e60a5fbbce716284fd3cf", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "139275f3453761b46f0837a4e4c2a00883b778abee997e299c52e1bcf3d8fc9f", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv7" + "sha256": "f62e5fb2e1908152c5f3e250faa2057c3d3351207eedd4c042ff540bba5f7575", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "e63a24e57d2104a09b37ee6aa04c76f4ae85bdf7a59e1bf79adc6d5f55340a31", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-aarch64" + "sha256": "9d6a6396b7604a390977ffff78379090f7c6910160bbd3b9669e2fcc635633c5", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "efe6b9901d7ee203a3d56c52a755f31a1022085cec12fcd84bbbc6b996780ef3", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-darwin-x86_64" + "sha256": "b8a12c6050c4dc7498759bdcd1c6580650168c8e346ceae2575e1fc51ced521a", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "162aafb7b1dd39ef2398d0bb816d4b329884285f64a00d69a7c6bedc51cc5ddb", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-darwin-aarch64" + "sha256": "51cd66bf94923ec8668f1a78c8740abb6cfbe1189da5720a8051a97be527372b", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "9c08eb875a7ffd4a832a585540a4c9c81da5dcab263ec3e704ab1d62b573636f", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-ppc64le" + "sha256": "463d3d220da0fe49c40605a1fc9e4ed7414f47c0ac028c80c55d2e758e99d7ee", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "5a3bff32ecf0a5a38a83afeb3dc2effd8ca3d52eb2e07ec000334663d493055b", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-riscv64" + "sha256": "03b0ec338482f61593074b62ffab482ae67ecdc5d868eb72bb8fe3f8a7680c91", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "297be6a0ece070ae95d5caf91a23b89dc1b2563e928db80eee480d7018919ee6", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-s390x" + "sha256": "3b24ddd85e859757801a8b9a7e53b96882fa5fd18cc12ee8750770f43b6afa14", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe" + "sha256": "78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "7f89a26e6b7af7b1d63901db2798d2dad0d56b6b3512828705fc8caada210236", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-aarch64.exe" + "sha256": "dc8d820fa7cb9f29a719a1444dcde39c00729ddbeeaf9cbf5057b655c72df698", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.20.2" + "version": "2.20.3" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From f745ee7e7dc85e8ddbcc23fd17cffe5735b93f23 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 11 Aug 2023 04:05:52 -0700 Subject: [PATCH 225/667] Update 24 to compose 2.20.3 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index c6163c724..89fdc8214 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.20.2 +ENV DOCKER_COMPOSE_VERSION 2.20.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-x86_64'; \ - sha256='b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64'; \ + sha256='f45e4cb687df8b48a57f656097ce7175fa8e8bef70be407b011e29ff663f475f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv6'; \ - sha256='39cef332454d1c7a26e12f8d9ee297908d1da9cb71112ede1816c550766ddb8e'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv6'; \ + sha256='e2010f160f5077c6d4d777965d21147328dbfb29894e60a5fbbce716284fd3cf'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv7'; \ - sha256='139275f3453761b46f0837a4e4c2a00883b778abee997e299c52e1bcf3d8fc9f'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv7'; \ + sha256='f62e5fb2e1908152c5f3e250faa2057c3d3351207eedd4c042ff540bba5f7575'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-aarch64'; \ - sha256='e63a24e57d2104a09b37ee6aa04c76f4ae85bdf7a59e1bf79adc6d5f55340a31'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-aarch64'; \ + sha256='9d6a6396b7604a390977ffff78379090f7c6910160bbd3b9669e2fcc635633c5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-ppc64le'; \ - sha256='9c08eb875a7ffd4a832a585540a4c9c81da5dcab263ec3e704ab1d62b573636f'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-ppc64le'; \ + sha256='463d3d220da0fe49c40605a1fc9e4ed7414f47c0ac028c80c55d2e758e99d7ee'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-riscv64'; \ - sha256='5a3bff32ecf0a5a38a83afeb3dc2effd8ca3d52eb2e07ec000334663d493055b'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-riscv64'; \ + sha256='03b0ec338482f61593074b62ffab482ae67ecdc5d868eb72bb8fe3f8a7680c91'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-s390x'; \ - sha256='297be6a0ece070ae95d5caf91a23b89dc1b2563e928db80eee480d7018919ee6'; \ + url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-s390x'; \ + sha256='3b24ddd85e859757801a8b9a7e53b96882fa5fd18cc12ee8750770f43b6afa14'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 5a542b4f5..b07bc0f23 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a +ENV DOCKER_COMPOSE_VERSION 2.20.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 92eaa9e30..d194ee9f2 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a +ENV DOCKER_COMPOSE_VERSION 2.20.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b1eb80672..750a17a43 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-x86_64" + "sha256": "f45e4cb687df8b48a57f656097ce7175fa8e8bef70be407b011e29ff663f475f", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "39cef332454d1c7a26e12f8d9ee297908d1da9cb71112ede1816c550766ddb8e", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv6" + "sha256": "e2010f160f5077c6d4d777965d21147328dbfb29894e60a5fbbce716284fd3cf", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "139275f3453761b46f0837a4e4c2a00883b778abee997e299c52e1bcf3d8fc9f", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv7" + "sha256": "f62e5fb2e1908152c5f3e250faa2057c3d3351207eedd4c042ff540bba5f7575", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "e63a24e57d2104a09b37ee6aa04c76f4ae85bdf7a59e1bf79adc6d5f55340a31", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-aarch64" + "sha256": "9d6a6396b7604a390977ffff78379090f7c6910160bbd3b9669e2fcc635633c5", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "efe6b9901d7ee203a3d56c52a755f31a1022085cec12fcd84bbbc6b996780ef3", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-darwin-x86_64" + "sha256": "b8a12c6050c4dc7498759bdcd1c6580650168c8e346ceae2575e1fc51ced521a", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "162aafb7b1dd39ef2398d0bb816d4b329884285f64a00d69a7c6bedc51cc5ddb", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-darwin-aarch64" + "sha256": "51cd66bf94923ec8668f1a78c8740abb6cfbe1189da5720a8051a97be527372b", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "9c08eb875a7ffd4a832a585540a4c9c81da5dcab263ec3e704ab1d62b573636f", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-ppc64le" + "sha256": "463d3d220da0fe49c40605a1fc9e4ed7414f47c0ac028c80c55d2e758e99d7ee", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "5a3bff32ecf0a5a38a83afeb3dc2effd8ca3d52eb2e07ec000334663d493055b", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-riscv64" + "sha256": "03b0ec338482f61593074b62ffab482ae67ecdc5d868eb72bb8fe3f8a7680c91", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "297be6a0ece070ae95d5caf91a23b89dc1b2563e928db80eee480d7018919ee6", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-s390x" + "sha256": "3b24ddd85e859757801a8b9a7e53b96882fa5fd18cc12ee8750770f43b6afa14", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe" + "sha256": "78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "7f89a26e6b7af7b1d63901db2798d2dad0d56b6b3512828705fc8caada210236", - "url": "https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-aarch64.exe" + "sha256": "dc8d820fa7cb9f29a719a1444dcde39c00729ddbeeaf9cbf5057b655c72df698", + "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.20.2" + "version": "2.20.3" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 8f403f6aadad92a9132ff9492f36c6c0a471a975 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 30 Aug 2023 16:04:20 -0700 Subject: [PATCH 226/667] Update 23 to compose 2.21.0 --- 23/cli/Dockerfile | 30 ++++++------ 23/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index f9ec2fdae..805d8b00a 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.20.3 +ENV DOCKER_COMPOSE_VERSION 2.21.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64'; \ - sha256='f45e4cb687df8b48a57f656097ce7175fa8e8bef70be407b011e29ff663f475f'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-x86_64'; \ + sha256='08e549924823e97a3ea303c2309b812dfd5223b8be5ff96fe41bf75181ce0977'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv6'; \ - sha256='e2010f160f5077c6d4d777965d21147328dbfb29894e60a5fbbce716284fd3cf'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv6'; \ + sha256='058ec96bc81ddeb317d160a6dea5bd8ac65dc2e90afff86bcc31f3f818f3fc5a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv7'; \ - sha256='f62e5fb2e1908152c5f3e250faa2057c3d3351207eedd4c042ff540bba5f7575'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv7'; \ + sha256='d46dbbbf5723c45125277c7c75b757b22679962707b2276a6d52f35964583c42'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-aarch64'; \ - sha256='9d6a6396b7604a390977ffff78379090f7c6910160bbd3b9669e2fcc635633c5'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-aarch64'; \ + sha256='5daf8d1a04cd649ad4a64221d0ca0cffcce33c740e60d5b15698545ce6d0436b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-ppc64le'; \ - sha256='463d3d220da0fe49c40605a1fc9e4ed7414f47c0ac028c80c55d2e758e99d7ee'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-ppc64le'; \ + sha256='fadbb72890d72f1246b213c453ec90cf494f4f8ea3dda2f63678de53a7e97c15'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-riscv64'; \ - sha256='03b0ec338482f61593074b62ffab482ae67ecdc5d868eb72bb8fe3f8a7680c91'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-riscv64'; \ + sha256='cd01536476864bd97c6ce3dfd317730535e51b2e252e9468de0379cc84298187'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-s390x'; \ - sha256='3b24ddd85e859757801a8b9a7e53b96882fa5fd18cc12ee8750770f43b6afa14'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-s390x'; \ + sha256='dfa8ab3ccc83311a2a4fddc43654de06c13cadc7caf629a0ddeceabd24bb6308'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index b56a6f1b5..acf862481 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199 +ENV DOCKER_COMPOSE_VERSION 2.21.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index a4a2d78aa..c9b225b66 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199 +ENV DOCKER_COMPOSE_VERSION 2.21.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 750a17a43..f835fb0c8 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "f45e4cb687df8b48a57f656097ce7175fa8e8bef70be407b011e29ff663f475f", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64" + "sha256": "08e549924823e97a3ea303c2309b812dfd5223b8be5ff96fe41bf75181ce0977", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e2010f160f5077c6d4d777965d21147328dbfb29894e60a5fbbce716284fd3cf", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv6" + "sha256": "058ec96bc81ddeb317d160a6dea5bd8ac65dc2e90afff86bcc31f3f818f3fc5a", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "f62e5fb2e1908152c5f3e250faa2057c3d3351207eedd4c042ff540bba5f7575", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv7" + "sha256": "d46dbbbf5723c45125277c7c75b757b22679962707b2276a6d52f35964583c42", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "9d6a6396b7604a390977ffff78379090f7c6910160bbd3b9669e2fcc635633c5", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-aarch64" + "sha256": "5daf8d1a04cd649ad4a64221d0ca0cffcce33c740e60d5b15698545ce6d0436b", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "b8a12c6050c4dc7498759bdcd1c6580650168c8e346ceae2575e1fc51ced521a", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-darwin-x86_64" + "sha256": "60c5f73460e9d3eadeecb4fc9813fd349409317ede568a0274f630be32db1292", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "51cd66bf94923ec8668f1a78c8740abb6cfbe1189da5720a8051a97be527372b", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-darwin-aarch64" + "sha256": "72676d2e28e95de9b272ccdfd31e514226714b2a8e6d4ca062eab995211d9d59", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "463d3d220da0fe49c40605a1fc9e4ed7414f47c0ac028c80c55d2e758e99d7ee", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-ppc64le" + "sha256": "fadbb72890d72f1246b213c453ec90cf494f4f8ea3dda2f63678de53a7e97c15", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "03b0ec338482f61593074b62ffab482ae67ecdc5d868eb72bb8fe3f8a7680c91", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-riscv64" + "sha256": "cd01536476864bd97c6ce3dfd317730535e51b2e252e9468de0379cc84298187", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "3b24ddd85e859757801a8b9a7e53b96882fa5fd18cc12ee8750770f43b6afa14", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-s390x" + "sha256": "dfa8ab3ccc83311a2a4fddc43654de06c13cadc7caf629a0ddeceabd24bb6308", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe" + "sha256": "cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "dc8d820fa7cb9f29a719a1444dcde39c00729ddbeeaf9cbf5057b655c72df698", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-aarch64.exe" + "sha256": "bcae777bed6ccc72e497d6b728d08128f2f3354b94c0dd093befdc9c8b79542e", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.20.3" + "version": "2.21.0" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From e7e25ec90b6db2e33b276aabfadcf580825a0fe8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 30 Aug 2023 16:06:33 -0700 Subject: [PATCH 227/667] Update 24 to compose 2.21.0 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 89fdc8214..db6cec899 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.20.3 +ENV DOCKER_COMPOSE_VERSION 2.21.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64'; \ - sha256='f45e4cb687df8b48a57f656097ce7175fa8e8bef70be407b011e29ff663f475f'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-x86_64'; \ + sha256='08e549924823e97a3ea303c2309b812dfd5223b8be5ff96fe41bf75181ce0977'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv6'; \ - sha256='e2010f160f5077c6d4d777965d21147328dbfb29894e60a5fbbce716284fd3cf'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv6'; \ + sha256='058ec96bc81ddeb317d160a6dea5bd8ac65dc2e90afff86bcc31f3f818f3fc5a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv7'; \ - sha256='f62e5fb2e1908152c5f3e250faa2057c3d3351207eedd4c042ff540bba5f7575'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv7'; \ + sha256='d46dbbbf5723c45125277c7c75b757b22679962707b2276a6d52f35964583c42'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-aarch64'; \ - sha256='9d6a6396b7604a390977ffff78379090f7c6910160bbd3b9669e2fcc635633c5'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-aarch64'; \ + sha256='5daf8d1a04cd649ad4a64221d0ca0cffcce33c740e60d5b15698545ce6d0436b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-ppc64le'; \ - sha256='463d3d220da0fe49c40605a1fc9e4ed7414f47c0ac028c80c55d2e758e99d7ee'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-ppc64le'; \ + sha256='fadbb72890d72f1246b213c453ec90cf494f4f8ea3dda2f63678de53a7e97c15'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-riscv64'; \ - sha256='03b0ec338482f61593074b62ffab482ae67ecdc5d868eb72bb8fe3f8a7680c91'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-riscv64'; \ + sha256='cd01536476864bd97c6ce3dfd317730535e51b2e252e9468de0379cc84298187'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-s390x'; \ - sha256='3b24ddd85e859757801a8b9a7e53b96882fa5fd18cc12ee8750770f43b6afa14'; \ + url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-s390x'; \ + sha256='dfa8ab3ccc83311a2a4fddc43654de06c13cadc7caf629a0ddeceabd24bb6308'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index b07bc0f23..c57a285b3 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199 +ENV DOCKER_COMPOSE_VERSION 2.21.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index d194ee9f2..5be3762c5 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.20.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199 +ENV DOCKER_COMPOSE_VERSION 2.21.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f835fb0c8..6c146fca0 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "f45e4cb687df8b48a57f656097ce7175fa8e8bef70be407b011e29ff663f475f", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64" + "sha256": "08e549924823e97a3ea303c2309b812dfd5223b8be5ff96fe41bf75181ce0977", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e2010f160f5077c6d4d777965d21147328dbfb29894e60a5fbbce716284fd3cf", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv6" + "sha256": "058ec96bc81ddeb317d160a6dea5bd8ac65dc2e90afff86bcc31f3f818f3fc5a", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "f62e5fb2e1908152c5f3e250faa2057c3d3351207eedd4c042ff540bba5f7575", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv7" + "sha256": "d46dbbbf5723c45125277c7c75b757b22679962707b2276a6d52f35964583c42", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "9d6a6396b7604a390977ffff78379090f7c6910160bbd3b9669e2fcc635633c5", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-aarch64" + "sha256": "5daf8d1a04cd649ad4a64221d0ca0cffcce33c740e60d5b15698545ce6d0436b", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "b8a12c6050c4dc7498759bdcd1c6580650168c8e346ceae2575e1fc51ced521a", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-darwin-x86_64" + "sha256": "60c5f73460e9d3eadeecb4fc9813fd349409317ede568a0274f630be32db1292", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "51cd66bf94923ec8668f1a78c8740abb6cfbe1189da5720a8051a97be527372b", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-darwin-aarch64" + "sha256": "72676d2e28e95de9b272ccdfd31e514226714b2a8e6d4ca062eab995211d9d59", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "463d3d220da0fe49c40605a1fc9e4ed7414f47c0ac028c80c55d2e758e99d7ee", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-ppc64le" + "sha256": "fadbb72890d72f1246b213c453ec90cf494f4f8ea3dda2f63678de53a7e97c15", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "03b0ec338482f61593074b62ffab482ae67ecdc5d868eb72bb8fe3f8a7680c91", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-riscv64" + "sha256": "cd01536476864bd97c6ce3dfd317730535e51b2e252e9468de0379cc84298187", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "3b24ddd85e859757801a8b9a7e53b96882fa5fd18cc12ee8750770f43b6afa14", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-s390x" + "sha256": "dfa8ab3ccc83311a2a4fddc43654de06c13cadc7caf629a0ddeceabd24bb6308", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe" + "sha256": "cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "dc8d820fa7cb9f29a719a1444dcde39c00729ddbeeaf9cbf5057b655c72df698", - "url": "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-aarch64.exe" + "sha256": "bcae777bed6ccc72e497d6b728d08128f2f3354b94c0dd093befdc9c8b79542e", + "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.20.3" + "version": "2.21.0" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 12a4554648b671111eaf4cf4636cb1d6310c65e1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 5 Sep 2023 16:04:32 -0700 Subject: [PATCH 228/667] Update 24 to 24.0.6 --- 24/cli/Dockerfile | 10 +++++----- 24/dind-rootless/Dockerfile | 4 ++-- 24/dind/Dockerfile | 8 ++++---- 24/windows/windowsservercore-1809/Dockerfile | 4 ++-- 24/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index db6cec899..aa5bea64b 100644 --- a/24/cli/Dockerfile +++ b/24/cli/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 24.0.5 +ENV DOCKER_VERSION 24.0.6 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.6.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.6.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.6.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.6.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind-rootless/Dockerfile b/24/dind-rootless/Dockerfile index 4a7d1c94e..766214d1f 100644 --- a/24/dind-rootless/Dockerfile +++ b/24/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-24.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.6.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.6.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index d5d20698e..8733b1481 100644 --- a/24/dind/Dockerfile +++ b/24/dind/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-24.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.6.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.6.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.6.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.6.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index c57a285b3..e96e4a752 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/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 24.0.5 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.5.zip +ENV DOCKER_VERSION 24.0.6 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.6.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/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 5be3762c5..18386d848 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/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 24.0.5 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.5.zip +ENV DOCKER_VERSION 24.0.6 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.6.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/versions.json b/versions.json index 6c146fca0..83b8a4a57 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "24": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.5.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.6.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.6.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.6.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.6.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.5.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.6.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.6.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.5.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.6.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.5" + "version": "24.0.6" }, "24-rc": null } From 134b3a2752690da62402fb33fe8db929e29d1434 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 21 Sep 2023 10:04:14 -0700 Subject: [PATCH 229/667] Update 23 to compose 2.22.0 --- 23/cli/Dockerfile | 30 ++++++------ 23/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile index 805d8b00a..cad1a7f86 100644 --- a/23/cli/Dockerfile +++ b/23/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.21.0 +ENV DOCKER_COMPOSE_VERSION 2.22.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-x86_64'; \ - sha256='08e549924823e97a3ea303c2309b812dfd5223b8be5ff96fe41bf75181ce0977'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-x86_64'; \ + sha256='e849450f1c5c20123aa7d63291e2a818b7a117f2e03e432853ece463dd09e67a'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv6'; \ - sha256='058ec96bc81ddeb317d160a6dea5bd8ac65dc2e90afff86bcc31f3f818f3fc5a'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv6'; \ + sha256='46cabb4363c5fa66e63c6055b1d0a6fe2c7995350e48f14816a752ae4132231d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv7'; \ - sha256='d46dbbbf5723c45125277c7c75b757b22679962707b2276a6d52f35964583c42'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv7'; \ + sha256='1a0d500eaae3c4ddbfdeb566896207c0628a671065b95d0e8907bca58f91d312'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-aarch64'; \ - sha256='5daf8d1a04cd649ad4a64221d0ca0cffcce33c740e60d5b15698545ce6d0436b'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-aarch64'; \ + sha256='572a22000d408fb524258b379bf272a007c8da977c3e8d47c34f4e45dd7b1932'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-ppc64le'; \ - sha256='fadbb72890d72f1246b213c453ec90cf494f4f8ea3dda2f63678de53a7e97c15'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-ppc64le'; \ + sha256='4d1a3e89fdb7641422dc5cbcab48fd2da337b03265cb5ac2858c3425bacf952c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-riscv64'; \ - sha256='cd01536476864bd97c6ce3dfd317730535e51b2e252e9468de0379cc84298187'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-riscv64'; \ + sha256='c45193b98c54e5a898e6b9095f70b0487599f19ce25b579ed2fcc3f868415aff'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-s390x'; \ - sha256='dfa8ab3ccc83311a2a4fddc43654de06c13cadc7caf629a0ddeceabd24bb6308'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-s390x'; \ + sha256='716aded74df512728638f1fe53170c46d94c1a085bc5a24108ce7101bc37bd81'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile index acf862481..3c335c5f9 100644 --- a/23/windows/windowsservercore-1809/Dockerfile +++ b/23/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.21.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd +ENV DOCKER_COMPOSE_VERSION 2.22.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile index c9b225b66..20b532d8a 100644 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ b/23/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.21.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd +ENV DOCKER_COMPOSE_VERSION 2.22.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 83b8a4a57..d9fc1af61 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "08e549924823e97a3ea303c2309b812dfd5223b8be5ff96fe41bf75181ce0977", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-x86_64" + "sha256": "e849450f1c5c20123aa7d63291e2a818b7a117f2e03e432853ece463dd09e67a", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "058ec96bc81ddeb317d160a6dea5bd8ac65dc2e90afff86bcc31f3f818f3fc5a", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv6" + "sha256": "46cabb4363c5fa66e63c6055b1d0a6fe2c7995350e48f14816a752ae4132231d", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d46dbbbf5723c45125277c7c75b757b22679962707b2276a6d52f35964583c42", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv7" + "sha256": "1a0d500eaae3c4ddbfdeb566896207c0628a671065b95d0e8907bca58f91d312", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "5daf8d1a04cd649ad4a64221d0ca0cffcce33c740e60d5b15698545ce6d0436b", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-aarch64" + "sha256": "572a22000d408fb524258b379bf272a007c8da977c3e8d47c34f4e45dd7b1932", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "60c5f73460e9d3eadeecb4fc9813fd349409317ede568a0274f630be32db1292", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-darwin-x86_64" + "sha256": "702d621e637fc9c8e833e031fd13fcee5c5fb82a926b4fba2f53bbf6a229a19d", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "72676d2e28e95de9b272ccdfd31e514226714b2a8e6d4ca062eab995211d9d59", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-darwin-aarch64" + "sha256": "e0d08ae27354354057c62e2fa80914e0955ec6335acfc6bc1fd7de53b8095f80", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "fadbb72890d72f1246b213c453ec90cf494f4f8ea3dda2f63678de53a7e97c15", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-ppc64le" + "sha256": "4d1a3e89fdb7641422dc5cbcab48fd2da337b03265cb5ac2858c3425bacf952c", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "cd01536476864bd97c6ce3dfd317730535e51b2e252e9468de0379cc84298187", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-riscv64" + "sha256": "c45193b98c54e5a898e6b9095f70b0487599f19ce25b579ed2fcc3f868415aff", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "dfa8ab3ccc83311a2a4fddc43654de06c13cadc7caf629a0ddeceabd24bb6308", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-s390x" + "sha256": "716aded74df512728638f1fe53170c46d94c1a085bc5a24108ce7101bc37bd81", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe" + "sha256": "eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "bcae777bed6ccc72e497d6b728d08128f2f3354b94c0dd093befdc9c8b79542e", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-aarch64.exe" + "sha256": "edd78984db5add5d793972372b9882adfc0a22f6dbc35b0c3a3a95ff1ec1851b", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.21.0" + "version": "2.22.0" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 112eb0209e4ce46e18059a9bd1b3b63f9409d360 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 21 Sep 2023 10:05:55 -0700 Subject: [PATCH 230/667] Update 24 to compose 2.22.0 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index aa5bea64b..f65e8e54f 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.21.0 +ENV DOCKER_COMPOSE_VERSION 2.22.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-x86_64'; \ - sha256='08e549924823e97a3ea303c2309b812dfd5223b8be5ff96fe41bf75181ce0977'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-x86_64'; \ + sha256='e849450f1c5c20123aa7d63291e2a818b7a117f2e03e432853ece463dd09e67a'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv6'; \ - sha256='058ec96bc81ddeb317d160a6dea5bd8ac65dc2e90afff86bcc31f3f818f3fc5a'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv6'; \ + sha256='46cabb4363c5fa66e63c6055b1d0a6fe2c7995350e48f14816a752ae4132231d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv7'; \ - sha256='d46dbbbf5723c45125277c7c75b757b22679962707b2276a6d52f35964583c42'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv7'; \ + sha256='1a0d500eaae3c4ddbfdeb566896207c0628a671065b95d0e8907bca58f91d312'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-aarch64'; \ - sha256='5daf8d1a04cd649ad4a64221d0ca0cffcce33c740e60d5b15698545ce6d0436b'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-aarch64'; \ + sha256='572a22000d408fb524258b379bf272a007c8da977c3e8d47c34f4e45dd7b1932'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-ppc64le'; \ - sha256='fadbb72890d72f1246b213c453ec90cf494f4f8ea3dda2f63678de53a7e97c15'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-ppc64le'; \ + sha256='4d1a3e89fdb7641422dc5cbcab48fd2da337b03265cb5ac2858c3425bacf952c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-riscv64'; \ - sha256='cd01536476864bd97c6ce3dfd317730535e51b2e252e9468de0379cc84298187'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-riscv64'; \ + sha256='c45193b98c54e5a898e6b9095f70b0487599f19ce25b579ed2fcc3f868415aff'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-s390x'; \ - sha256='dfa8ab3ccc83311a2a4fddc43654de06c13cadc7caf629a0ddeceabd24bb6308'; \ + url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-s390x'; \ + sha256='716aded74df512728638f1fe53170c46d94c1a085bc5a24108ce7101bc37bd81'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index e96e4a752..e93ad2600 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.21.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd +ENV DOCKER_COMPOSE_VERSION 2.22.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 18386d848..be3ba171e 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.21.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd +ENV DOCKER_COMPOSE_VERSION 2.22.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index d9fc1af61..9a47dcf4b 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "08e549924823e97a3ea303c2309b812dfd5223b8be5ff96fe41bf75181ce0977", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-x86_64" + "sha256": "e849450f1c5c20123aa7d63291e2a818b7a117f2e03e432853ece463dd09e67a", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "058ec96bc81ddeb317d160a6dea5bd8ac65dc2e90afff86bcc31f3f818f3fc5a", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv6" + "sha256": "46cabb4363c5fa66e63c6055b1d0a6fe2c7995350e48f14816a752ae4132231d", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d46dbbbf5723c45125277c7c75b757b22679962707b2276a6d52f35964583c42", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-armv7" + "sha256": "1a0d500eaae3c4ddbfdeb566896207c0628a671065b95d0e8907bca58f91d312", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "5daf8d1a04cd649ad4a64221d0ca0cffcce33c740e60d5b15698545ce6d0436b", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-aarch64" + "sha256": "572a22000d408fb524258b379bf272a007c8da977c3e8d47c34f4e45dd7b1932", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "60c5f73460e9d3eadeecb4fc9813fd349409317ede568a0274f630be32db1292", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-darwin-x86_64" + "sha256": "702d621e637fc9c8e833e031fd13fcee5c5fb82a926b4fba2f53bbf6a229a19d", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "72676d2e28e95de9b272ccdfd31e514226714b2a8e6d4ca062eab995211d9d59", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-darwin-aarch64" + "sha256": "e0d08ae27354354057c62e2fa80914e0955ec6335acfc6bc1fd7de53b8095f80", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "fadbb72890d72f1246b213c453ec90cf494f4f8ea3dda2f63678de53a7e97c15", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-ppc64le" + "sha256": "4d1a3e89fdb7641422dc5cbcab48fd2da337b03265cb5ac2858c3425bacf952c", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "cd01536476864bd97c6ce3dfd317730535e51b2e252e9468de0379cc84298187", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-riscv64" + "sha256": "c45193b98c54e5a898e6b9095f70b0487599f19ce25b579ed2fcc3f868415aff", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "dfa8ab3ccc83311a2a4fddc43654de06c13cadc7caf629a0ddeceabd24bb6308", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-linux-s390x" + "sha256": "716aded74df512728638f1fe53170c46d94c1a085bc5a24108ce7101bc37bd81", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "cfb3d206ce3beed19ef73bde752f303f733c9804307404f9480ad53cf53bd1bd", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-x86_64.exe" + "sha256": "eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "bcae777bed6ccc72e497d6b728d08128f2f3354b94c0dd093befdc9c8b79542e", - "url": "https://github.com/docker/compose/releases/download/v2.21.0/docker-compose-windows-aarch64.exe" + "sha256": "edd78984db5add5d793972372b9882adfc0a22f6dbc35b0c3a3a95ff1ec1851b", + "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.21.0" + "version": "2.22.0" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From b0550bbda87ae407b6fcf5b039afed7b8c256251 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 28 Sep 2023 11:28:18 +0200 Subject: [PATCH 231/667] re-enable arm32v6 and arm32v7 builds Builds for these architectures were broken for some time, but this should be resolved now, so we can re-enable these (fingers crossed). This reverts commit 461a3ec6ed346995c5949cc2d70c08b9d049caa0. Signed-off-by: Sebastiaan van Stijn --- generate-stackbrew-library.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 4c1befe71..d5304112e 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -81,9 +81,6 @@ versionArches() { .[env.version].arches | to_entries[] | select(.value.'"$selector"') | .key - # all arm32 builds are broken: - # https://github.com/docker-library/docker/issues/260 - | select(startswith("arm32") | not) ' versions.json | sort ) \ <(xargs -n1 <<<"$parentArches" | sort) From ff78b7b5f1f0830aa327380eb396dea53380b517 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Fri, 29 Sep 2023 11:22:05 -0700 Subject: [PATCH 232/667] Remove version 23.x it will no longer receive updates on download.docker.com --- 23/cli/Dockerfile | 161 -------------- 23/cli/docker-entrypoint.sh | 61 ------ 23/cli/modprobe.sh | 20 -- 23/dind-rootless/Dockerfile | 55 ----- 23/dind/Dockerfile | 89 -------- 23/dind/dockerd-entrypoint.sh | 198 ------------------ 23/git/Dockerfile | 9 - 23/windows/windowsservercore-1809/Dockerfile | 91 -------- .../windowsservercore-ltsc2022/Dockerfile | 91 -------- 24/cli/Dockerfile | 4 +- Dockerfile-cli.template | 4 +- versions.json | 142 ------------- 12 files changed, 4 insertions(+), 921 deletions(-) delete mode 100644 23/cli/Dockerfile delete mode 100755 23/cli/docker-entrypoint.sh delete mode 100755 23/cli/modprobe.sh delete mode 100644 23/dind-rootless/Dockerfile delete mode 100644 23/dind/Dockerfile delete mode 100755 23/dind/dockerd-entrypoint.sh delete mode 100644 23/git/Dockerfile delete mode 100644 23/windows/windowsservercore-1809/Dockerfile delete mode 100644 23/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/23/cli/Dockerfile b/23/cli/Dockerfile deleted file mode 100644 index cad1a7f86..000000000 --- a/23/cli/Dockerfile +++ /dev/null @@ -1,161 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.18 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v20.10.21/hack/make.sh#L115 -# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303 -# - 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.6 - -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.6.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.6.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.6.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.6.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.11.2 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64'; \ - sha256='311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6'; \ - sha256='c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7'; \ - sha256='4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64'; \ - sha256='565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le'; \ - sha256='c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64'; \ - sha256='c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x'; \ - sha256='02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.22.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-x86_64'; \ - sha256='e849450f1c5c20123aa7d63291e2a818b7a117f2e03e432853ece463dd09e67a'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv6'; \ - sha256='46cabb4363c5fa66e63c6055b1d0a6fe2c7995350e48f14816a752ae4132231d'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv7'; \ - sha256='1a0d500eaae3c4ddbfdeb566896207c0628a671065b95d0e8907bca58f91d312'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-aarch64'; \ - sha256='572a22000d408fb524258b379bf272a007c8da977c3e8d47c34f4e45dd7b1932'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-ppc64le'; \ - sha256='4d1a3e89fdb7641422dc5cbcab48fd2da337b03265cb5ac2858c3425bacf952c'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-riscv64'; \ - sha256='c45193b98c54e5a898e6b9095f70b0487599f19ce25b579ed2fcc3f868415aff'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-s390x'; \ - sha256='716aded74df512728638f1fe53170c46d94c1a085bc5a24108ce7101bc37bd81'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/23/cli/docker-entrypoint.sh b/23/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/23/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/23/cli/modprobe.sh b/23/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/23/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/23/dind-rootless/Dockerfile b/23/dind-rootless/Dockerfile deleted file mode 100644 index d8db2e7c0..000000000 --- a/23/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:23-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -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.6.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.6.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/23/dind/Dockerfile b/23/dind/Dockerfile deleted file mode 100644 index 0cc939c33..000000000 --- a/23/dind/Dockerfile +++ /dev/null @@ -1,89 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:23-cli - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - ip6tables \ - iptables \ - openssl \ - shadow-uidmap \ - xfsprogs \ - xz \ -# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) - pigz \ - ; \ -# only install zfs if it's available for the current architecture -# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) -# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch - if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ - apk add --no-cache zfs; \ - fi - -# TODO aufs-tools - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -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.6.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-23.0.6.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.6.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.6.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:23-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT d58df1fc6c866447ce2cd129af10e5b507705624 - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/23/dind/dockerd-entrypoint.sh b/23/dind/dockerd-entrypoint.sh deleted file mode 100755 index 00819384b..000000000 --- a/23/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,198 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - if ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - modprobe ip_tables || : - fi - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/23/git/Dockerfile b/23/git/Dockerfile deleted file mode 100644 index cf58421bf..000000000 --- a/23/git/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:23-dind - -RUN apk add --no-cache git diff --git a/23/windows/windowsservercore-1809/Dockerfile b/23/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 3c335c5f9..000000000 --- a/23/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 23.0.6 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.6.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.22.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/23/windows/windowsservercore-ltsc2022/Dockerfile b/23/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 20b532d8a..000000000 --- a/23/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 23.0.6 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.6.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.22.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index f65e8e54f..f02af6dc1 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -12,8 +12,8 @@ RUN apk add --no-cache \ openssh-client # ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v20.10.21/hack/make.sh#L115 -# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303 +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index be92d9521..1ae00e841 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -7,8 +7,8 @@ RUN apk add --no-cache \ openssh-client # ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v20.10.21/hack/make.sh#L115 -# - https://github.com/golang/go/blob/go1.19.3/src/net/conf.go#L227-L303 +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf diff --git a/versions.json b/versions.json index 9a47dcf4b..5a9cf00e3 100644 --- a/versions.json +++ b/versions.json @@ -1,146 +1,4 @@ { - "23": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-23.0.6.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.6.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-23.0.6.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-23.0.6.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-23.0.6.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.6.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-23.0.6.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.11.2.linux-amd64", - "sha256": "311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.11.2.linux-arm-v6", - "sha256": "c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.11.2.linux-arm-v7", - "sha256": "4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.11.2.linux-arm64", - "sha256": "565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64" - }, - "ppc64le": { - "file": "buildx-v0.11.2.linux-ppc64le", - "sha256": "c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.11.2.linux-riscv64", - "sha256": "c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.11.2.linux-s390x", - "sha256": "02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.11.2.windows-amd64.exe", - "sha256": "d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.11.2.windows-arm64.exe", - "sha256": "9278cb193ca5d508ff632416c07712a7d128349a1b2ede3085456758e2f90d3f", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-arm64.exe" - } - }, - "version": "0.11.2" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "e849450f1c5c20123aa7d63291e2a818b7a117f2e03e432853ece463dd09e67a", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "46cabb4363c5fa66e63c6055b1d0a6fe2c7995350e48f14816a752ae4132231d", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "1a0d500eaae3c4ddbfdeb566896207c0628a671065b95d0e8907bca58f91d312", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "572a22000d408fb524258b379bf272a007c8da977c3e8d47c34f4e45dd7b1932", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "702d621e637fc9c8e833e031fd13fcee5c5fb82a926b4fba2f53bbf6a229a19d", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "e0d08ae27354354057c62e2fa80914e0955ec6335acfc6bc1fd7de53b8095f80", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "4d1a3e89fdb7641422dc5cbcab48fd2da337b03265cb5ac2858c3425bacf952c", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "c45193b98c54e5a898e6b9095f70b0487599f19ce25b579ed2fcc3f868415aff", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "716aded74df512728638f1fe53170c46d94c1a085bc5a24108ce7101bc37bd81", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "edd78984db5add5d793972372b9882adfc0a22f6dbc35b0c3a3a95ff1ec1851b", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.22.0" - }, - "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", - "variants": [ - "cli", - "dind", - "dind-rootless", - "git", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "23.0.6" - }, - "23-rc": null, "24": { "arches": { "amd64": { From a248877a927ea421717db21fd168482b027913d2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 18 Oct 2023 10:04:26 -0700 Subject: [PATCH 233/667] Update 24 to compose 2.23.0 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index f02af6dc1..d6b8c5f6a 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.22.0 +ENV DOCKER_COMPOSE_VERSION 2.23.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-x86_64'; \ - sha256='e849450f1c5c20123aa7d63291e2a818b7a117f2e03e432853ece463dd09e67a'; \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64'; \ + sha256='6e06123399e5428fbd603564afdac74821fa0a7b4465e8a1a2359b362fc42fc4'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv6'; \ - sha256='46cabb4363c5fa66e63c6055b1d0a6fe2c7995350e48f14816a752ae4132231d'; \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv6'; \ + sha256='75889ad81c5b0b07805920e398eaa7fb41c1321c81942daa07a5b5c5a1a27bdb'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv7'; \ - sha256='1a0d500eaae3c4ddbfdeb566896207c0628a671065b95d0e8907bca58f91d312'; \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv7'; \ + sha256='2cd4af627462720384cfd2ba24d951854707d7c1fa37618c9e0319139f8a2012'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-aarch64'; \ - sha256='572a22000d408fb524258b379bf272a007c8da977c3e8d47c34f4e45dd7b1932'; \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-aarch64'; \ + sha256='5c09e2c6b1cd9fc1be535690ee62712687ad12f0d08b14c27d30442f0e85b955'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-ppc64le'; \ - sha256='4d1a3e89fdb7641422dc5cbcab48fd2da337b03265cb5ac2858c3425bacf952c'; \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-ppc64le'; \ + sha256='ff524f6d11050483abda01c5b1b33626c6c2f1b835df8514db6a42148d5095fc'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-riscv64'; \ - sha256='c45193b98c54e5a898e6b9095f70b0487599f19ce25b579ed2fcc3f868415aff'; \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-riscv64'; \ + sha256='00302be14ad7d981eb86b834c09deb8186231b416c16454f9971bfcc0ec7e22f'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-s390x'; \ - sha256='716aded74df512728638f1fe53170c46d94c1a085bc5a24108ce7101bc37bd81'; \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-s390x'; \ + sha256='323c2e92b3150ef94dc4201770e06ed7bacbe811abd77a23108cceea032fcf63'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index e93ad2600..adabdeec3 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.22.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c +ENV DOCKER_COMPOSE_VERSION 2.23.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index be3ba171e..65aef44b1 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.22.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c +ENV DOCKER_COMPOSE_VERSION 2.23.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 5a9cf00e3..91215508f 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e849450f1c5c20123aa7d63291e2a818b7a117f2e03e432853ece463dd09e67a", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-x86_64" + "sha256": "6e06123399e5428fbd603564afdac74821fa0a7b4465e8a1a2359b362fc42fc4", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "46cabb4363c5fa66e63c6055b1d0a6fe2c7995350e48f14816a752ae4132231d", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv6" + "sha256": "75889ad81c5b0b07805920e398eaa7fb41c1321c81942daa07a5b5c5a1a27bdb", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "1a0d500eaae3c4ddbfdeb566896207c0628a671065b95d0e8907bca58f91d312", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv7" + "sha256": "2cd4af627462720384cfd2ba24d951854707d7c1fa37618c9e0319139f8a2012", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "572a22000d408fb524258b379bf272a007c8da977c3e8d47c34f4e45dd7b1932", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-aarch64" + "sha256": "5c09e2c6b1cd9fc1be535690ee62712687ad12f0d08b14c27d30442f0e85b955", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "702d621e637fc9c8e833e031fd13fcee5c5fb82a926b4fba2f53bbf6a229a19d", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-darwin-x86_64" + "sha256": "b9490c28cc975cf809cca70c57d7e13f1d4c7d68ab95e237feee98332d140d62", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "e0d08ae27354354057c62e2fa80914e0955ec6335acfc6bc1fd7de53b8095f80", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-darwin-aarch64" + "sha256": "6a316b3662db5e0e90ee889303f09dfec272ceef53d6765331ef68d18413a017", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4d1a3e89fdb7641422dc5cbcab48fd2da337b03265cb5ac2858c3425bacf952c", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-ppc64le" + "sha256": "ff524f6d11050483abda01c5b1b33626c6c2f1b835df8514db6a42148d5095fc", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "c45193b98c54e5a898e6b9095f70b0487599f19ce25b579ed2fcc3f868415aff", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-riscv64" + "sha256": "00302be14ad7d981eb86b834c09deb8186231b416c16454f9971bfcc0ec7e22f", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "716aded74df512728638f1fe53170c46d94c1a085bc5a24108ce7101bc37bd81", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-s390x" + "sha256": "323c2e92b3150ef94dc4201770e06ed7bacbe811abd77a23108cceea032fcf63", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe" + "sha256": "254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "edd78984db5add5d793972372b9882adfc0a22f6dbc35b0c3a3a95ff1ec1851b", - "url": "https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-aarch64.exe" + "sha256": "cbf63deac9f62fd6ff13c2c3f245f9da2668bbe4e590c60cf814ff37fbb500c6", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.22.0" + "version": "2.23.0" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 62c197fe7632d3bce351d4c337a5a129ebd8f771 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 26 Oct 2023 10:04:13 -0700 Subject: [PATCH 234/667] Update 24 to 24.0.7 --- 24/cli/Dockerfile | 10 +++++----- 24/dind-rootless/Dockerfile | 4 ++-- 24/dind/Dockerfile | 8 ++++---- 24/windows/windowsservercore-1809/Dockerfile | 4 ++-- 24/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index d6b8c5f6a..03c8934ff 100644 --- a/24/cli/Dockerfile +++ b/24/cli/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 24.0.6 +ENV DOCKER_VERSION 24.0.7 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.7.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.7.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.7.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.7.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind-rootless/Dockerfile b/24/dind-rootless/Dockerfile index 766214d1f..eb973a8b1 100644 --- a/24/dind-rootless/Dockerfile +++ b/24/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-24.0.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.7.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.7.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index 8733b1481..835b17abf 100644 --- a/24/dind/Dockerfile +++ b/24/dind/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-24.0.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.7.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.7.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.7.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.6.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.7.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index adabdeec3..a96371daa 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/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 24.0.6 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.6.zip +ENV DOCKER_VERSION 24.0.7 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.7.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/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 65aef44b1..bedb85914 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/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 24.0.6 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.6.zip +ENV DOCKER_VERSION 24.0.7 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.7.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/versions.json b/versions.json index 91215508f..f7a33dec4 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "24": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.6.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.6.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.7.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.7.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.6.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.7.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.6.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.7.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.6.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.6.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.7.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.7.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.6.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.7.zip" } }, "buildx": { @@ -138,7 +138,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.6" + "version": "24.0.7" }, "24-rc": null } From 2e213030c57a2134a77bf17b0710dff1a184a7c1 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Mon, 13 Nov 2023 14:06:12 -0800 Subject: [PATCH 235/667] Add 25.0.0-beta.1 pre-release --- 25-rc/cli/Dockerfile | 161 ++++++++++++++ 25-rc/cli/docker-entrypoint.sh | 61 ++++++ 25-rc/cli/modprobe.sh | 20 ++ 25-rc/dind-rootless/Dockerfile | 55 +++++ 25-rc/dind/Dockerfile | 89 ++++++++ 25-rc/dind/dockerd-entrypoint.sh | 198 ++++++++++++++++++ 25-rc/git/Dockerfile | 9 + .../windows/windowsservercore-1809/Dockerfile | 91 ++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 ++++++++ versions.json | 144 ++++++++++++- 10 files changed, 918 insertions(+), 1 deletion(-) create mode 100644 25-rc/cli/Dockerfile create mode 100755 25-rc/cli/docker-entrypoint.sh create mode 100755 25-rc/cli/modprobe.sh create mode 100644 25-rc/dind-rootless/Dockerfile create mode 100644 25-rc/dind/Dockerfile create mode 100755 25-rc/dind/dockerd-entrypoint.sh create mode 100644 25-rc/git/Dockerfile create mode 100644 25-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 25-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile new file mode 100644 index 000000000..196be371f --- /dev/null +++ b/25-rc/cli/Dockerfile @@ -0,0 +1,161 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.18 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - 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 25.0.0-beta.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.11.2 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64'; \ + sha256='311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6'; \ + sha256='c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7'; \ + sha256='4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64'; \ + sha256='565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le'; \ + sha256='c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64'; \ + sha256='c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x'; \ + sha256='02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.23.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64'; \ + sha256='6e06123399e5428fbd603564afdac74821fa0a7b4465e8a1a2359b362fc42fc4'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv6'; \ + sha256='75889ad81c5b0b07805920e398eaa7fb41c1321c81942daa07a5b5c5a1a27bdb'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv7'; \ + sha256='2cd4af627462720384cfd2ba24d951854707d7c1fa37618c9e0319139f8a2012'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-aarch64'; \ + sha256='5c09e2c6b1cd9fc1be535690ee62712687ad12f0d08b14c27d30442f0e85b955'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-ppc64le'; \ + sha256='ff524f6d11050483abda01c5b1b33626c6c2f1b835df8514db6a42148d5095fc'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-riscv64'; \ + sha256='00302be14ad7d981eb86b834c09deb8186231b416c16454f9971bfcc0ec7e22f'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-s390x'; \ + sha256='323c2e92b3150ef94dc4201770e06ed7bacbe811abd77a23108cceea032fcf63'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/25-rc/cli/docker-entrypoint.sh b/25-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/25-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/25-rc/cli/modprobe.sh b/25-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/25-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/25-rc/dind-rootless/Dockerfile b/25-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..4f826c2f9 --- /dev/null +++ b/25-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:25-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-beta.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/25-rc/dind/Dockerfile b/25-rc/dind/Dockerfile new file mode 100644 index 000000000..c55020780 --- /dev/null +++ b/25-rc/dind/Dockerfile @@ -0,0 +1,89 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:25-rc-cli + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + ip6tables \ + iptables \ + openssl \ + shadow-uidmap \ + xfsprogs \ + xz \ +# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) + pigz \ + ; \ +# only install zfs if it's available for the current architecture +# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) +# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch + if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ + apk add --no-cache zfs; \ + fi + +# TODO aufs-tools + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:25-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT d58df1fc6c866447ce2cd129af10e5b507705624 + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/25-rc/dind/dockerd-entrypoint.sh b/25-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..00819384b --- /dev/null +++ b/25-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,198 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + if ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + modprobe ip_tables || : + fi + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/25-rc/git/Dockerfile b/25-rc/git/Dockerfile new file mode 100644 index 000000000..a4ffbbed1 --- /dev/null +++ b/25-rc/git/Dockerfile @@ -0,0 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:25-rc-dind + +RUN apk add --no-cache git diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..01a83b877 --- /dev/null +++ b/25-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 25.0.0-beta.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.11.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.23.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..5bce79559 --- /dev/null +++ b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 25.0.0-beta.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.11.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.23.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index f7a33dec4..b1eaec789 100644 --- a/versions.json +++ b/versions.json @@ -140,5 +140,147 @@ ], "version": "24.0.7" }, - "24-rc": null + "24-rc": null, + "25": null, + "25-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-beta.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.11.2.linux-amd64", + "sha256": "311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.11.2.linux-arm-v6", + "sha256": "c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.11.2.linux-arm-v7", + "sha256": "4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.11.2.linux-arm64", + "sha256": "565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.11.2.linux-ppc64le", + "sha256": "c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.11.2.linux-riscv64", + "sha256": "c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.11.2.linux-s390x", + "sha256": "02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.11.2.windows-amd64.exe", + "sha256": "d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.11.2.windows-arm64.exe", + "sha256": "9278cb193ca5d508ff632416c07712a7d128349a1b2ede3085456758e2f90d3f", + "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-arm64.exe" + } + }, + "version": "0.11.2" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "6e06123399e5428fbd603564afdac74821fa0a7b4465e8a1a2359b362fc42fc4", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "75889ad81c5b0b07805920e398eaa7fb41c1321c81942daa07a5b5c5a1a27bdb", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "2cd4af627462720384cfd2ba24d951854707d7c1fa37618c9e0319139f8a2012", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "5c09e2c6b1cd9fc1be535690ee62712687ad12f0d08b14c27d30442f0e85b955", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "b9490c28cc975cf809cca70c57d7e13f1d4c7d68ab95e237feee98332d140d62", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "6a316b3662db5e0e90ee889303f09dfec272ceef53d6765331ef68d18413a017", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "ff524f6d11050483abda01c5b1b33626c6c2f1b835df8514db6a42148d5095fc", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "00302be14ad7d981eb86b834c09deb8186231b416c16454f9971bfcc0ec7e22f", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "323c2e92b3150ef94dc4201770e06ed7bacbe811abd77a23108cceea032fcf63", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "cbf63deac9f62fd6ff13c2c3f245f9da2668bbe4e590c60cf814ff37fbb500c6", + "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.23.0" + }, + "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", + "variants": [ + "cli", + "dind", + "dind-rootless", + "git", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "25.0.0-beta.1" + } } From 94e67b35f7917611671a21b2b2ffa320afcc4a26 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Nov 2023 04:04:12 -0800 Subject: [PATCH 236/667] Update 24 to compose 2.23.1 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 03c8934ff..98e72b54d 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.23.0 +ENV DOCKER_COMPOSE_VERSION 2.23.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64'; \ - sha256='6e06123399e5428fbd603564afdac74821fa0a7b4465e8a1a2359b362fc42fc4'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-x86_64'; \ + sha256='4f9b5313cf3eb1651b65aa6fc2fe1f59eb3812b7566f7c1b853be429b81bf3ab'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv6'; \ - sha256='75889ad81c5b0b07805920e398eaa7fb41c1321c81942daa07a5b5c5a1a27bdb'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv6'; \ + sha256='44b679381da55d1a673e5e638ac6d34f81e38e58ac656c530e27bb57a0ef930d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv7'; \ - sha256='2cd4af627462720384cfd2ba24d951854707d7c1fa37618c9e0319139f8a2012'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv7'; \ + sha256='347b65d0cec622976bb753550d2708c8c9c760d55c1b5952a6800f5fadd4781c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-aarch64'; \ - sha256='5c09e2c6b1cd9fc1be535690ee62712687ad12f0d08b14c27d30442f0e85b955'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-aarch64'; \ + sha256='27b3cb1f066cdba191c4df96255a3d7178294763c9d67fba528f769968fc2e65'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-ppc64le'; \ - sha256='ff524f6d11050483abda01c5b1b33626c6c2f1b835df8514db6a42148d5095fc'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-ppc64le'; \ + sha256='76981fe4b032385752c5bb07144a22a7dfb599da15eca6fa1775e94364833475'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-riscv64'; \ - sha256='00302be14ad7d981eb86b834c09deb8186231b416c16454f9971bfcc0ec7e22f'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-riscv64'; \ + sha256='1ee27dd153bd796686ece5d1829266b9b0db0a2ed67e7dbef023457da6dc5761'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-s390x'; \ - sha256='323c2e92b3150ef94dc4201770e06ed7bacbe811abd77a23108cceea032fcf63'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-s390x'; \ + sha256='9ee5fd812e7e52c08b95cd59673b956f2248343c2fb51eb8bcf635b02cfcbee4'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index a96371daa..37eb2c493 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da +ENV DOCKER_COMPOSE_VERSION 2.23.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index bedb85914..4c550fc20 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da +ENV DOCKER_COMPOSE_VERSION 2.23.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b1eaec789..e6219a6e7 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6e06123399e5428fbd603564afdac74821fa0a7b4465e8a1a2359b362fc42fc4", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64" + "sha256": "4f9b5313cf3eb1651b65aa6fc2fe1f59eb3812b7566f7c1b853be429b81bf3ab", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "75889ad81c5b0b07805920e398eaa7fb41c1321c81942daa07a5b5c5a1a27bdb", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv6" + "sha256": "44b679381da55d1a673e5e638ac6d34f81e38e58ac656c530e27bb57a0ef930d", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "2cd4af627462720384cfd2ba24d951854707d7c1fa37618c9e0319139f8a2012", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv7" + "sha256": "347b65d0cec622976bb753550d2708c8c9c760d55c1b5952a6800f5fadd4781c", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "5c09e2c6b1cd9fc1be535690ee62712687ad12f0d08b14c27d30442f0e85b955", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-aarch64" + "sha256": "27b3cb1f066cdba191c4df96255a3d7178294763c9d67fba528f769968fc2e65", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "b9490c28cc975cf809cca70c57d7e13f1d4c7d68ab95e237feee98332d140d62", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-darwin-x86_64" + "sha256": "d4ebde5c4a6497a3a7dbac600ee235e7ac462a5366311f642eb7923d660c30c2", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "6a316b3662db5e0e90ee889303f09dfec272ceef53d6765331ef68d18413a017", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-darwin-aarch64" + "sha256": "c756706b30016af4f62d44903fe4635fdfce04289f5ced98fd88d965a35fcad3", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "ff524f6d11050483abda01c5b1b33626c6c2f1b835df8514db6a42148d5095fc", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-ppc64le" + "sha256": "76981fe4b032385752c5bb07144a22a7dfb599da15eca6fa1775e94364833475", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "00302be14ad7d981eb86b834c09deb8186231b416c16454f9971bfcc0ec7e22f", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-riscv64" + "sha256": "1ee27dd153bd796686ece5d1829266b9b0db0a2ed67e7dbef023457da6dc5761", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "323c2e92b3150ef94dc4201770e06ed7bacbe811abd77a23108cceea032fcf63", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-s390x" + "sha256": "9ee5fd812e7e52c08b95cd59673b956f2248343c2fb51eb8bcf635b02cfcbee4", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe" + "sha256": "13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "cbf63deac9f62fd6ff13c2c3f245f9da2668bbe4e590c60cf814ff37fbb500c6", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-aarch64.exe" + "sha256": "f8abeebc8f07bbd010a8b595b32a34b9dc465fb52687be51d0805c773f39565a", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.23.0" + "version": "2.23.1" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From ce004f9a12b26176ae3e6aca0a77359f645cf71a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Nov 2023 04:05:39 -0800 Subject: [PATCH 237/667] Update 25-rc to compose 2.23.1 --- 25-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 196be371f..0a483895e 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.23.0 +ENV DOCKER_COMPOSE_VERSION 2.23.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64'; \ - sha256='6e06123399e5428fbd603564afdac74821fa0a7b4465e8a1a2359b362fc42fc4'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-x86_64'; \ + sha256='4f9b5313cf3eb1651b65aa6fc2fe1f59eb3812b7566f7c1b853be429b81bf3ab'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv6'; \ - sha256='75889ad81c5b0b07805920e398eaa7fb41c1321c81942daa07a5b5c5a1a27bdb'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv6'; \ + sha256='44b679381da55d1a673e5e638ac6d34f81e38e58ac656c530e27bb57a0ef930d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv7'; \ - sha256='2cd4af627462720384cfd2ba24d951854707d7c1fa37618c9e0319139f8a2012'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv7'; \ + sha256='347b65d0cec622976bb753550d2708c8c9c760d55c1b5952a6800f5fadd4781c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-aarch64'; \ - sha256='5c09e2c6b1cd9fc1be535690ee62712687ad12f0d08b14c27d30442f0e85b955'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-aarch64'; \ + sha256='27b3cb1f066cdba191c4df96255a3d7178294763c9d67fba528f769968fc2e65'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-ppc64le'; \ - sha256='ff524f6d11050483abda01c5b1b33626c6c2f1b835df8514db6a42148d5095fc'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-ppc64le'; \ + sha256='76981fe4b032385752c5bb07144a22a7dfb599da15eca6fa1775e94364833475'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-riscv64'; \ - sha256='00302be14ad7d981eb86b834c09deb8186231b416c16454f9971bfcc0ec7e22f'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-riscv64'; \ + sha256='1ee27dd153bd796686ece5d1829266b9b0db0a2ed67e7dbef023457da6dc5761'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-s390x'; \ - sha256='323c2e92b3150ef94dc4201770e06ed7bacbe811abd77a23108cceea032fcf63'; \ + url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-s390x'; \ + sha256='9ee5fd812e7e52c08b95cd59673b956f2248343c2fb51eb8bcf635b02cfcbee4'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 01a83b877..0afe0e039 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da +ENV DOCKER_COMPOSE_VERSION 2.23.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 5bce79559..575be9651 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da +ENV DOCKER_COMPOSE_VERSION 2.23.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index e6219a6e7..efcf02bb6 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6e06123399e5428fbd603564afdac74821fa0a7b4465e8a1a2359b362fc42fc4", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64" + "sha256": "4f9b5313cf3eb1651b65aa6fc2fe1f59eb3812b7566f7c1b853be429b81bf3ab", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "75889ad81c5b0b07805920e398eaa7fb41c1321c81942daa07a5b5c5a1a27bdb", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv6" + "sha256": "44b679381da55d1a673e5e638ac6d34f81e38e58ac656c530e27bb57a0ef930d", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "2cd4af627462720384cfd2ba24d951854707d7c1fa37618c9e0319139f8a2012", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv7" + "sha256": "347b65d0cec622976bb753550d2708c8c9c760d55c1b5952a6800f5fadd4781c", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "5c09e2c6b1cd9fc1be535690ee62712687ad12f0d08b14c27d30442f0e85b955", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-aarch64" + "sha256": "27b3cb1f066cdba191c4df96255a3d7178294763c9d67fba528f769968fc2e65", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "b9490c28cc975cf809cca70c57d7e13f1d4c7d68ab95e237feee98332d140d62", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-darwin-x86_64" + "sha256": "d4ebde5c4a6497a3a7dbac600ee235e7ac462a5366311f642eb7923d660c30c2", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "6a316b3662db5e0e90ee889303f09dfec272ceef53d6765331ef68d18413a017", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-darwin-aarch64" + "sha256": "c756706b30016af4f62d44903fe4635fdfce04289f5ced98fd88d965a35fcad3", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "ff524f6d11050483abda01c5b1b33626c6c2f1b835df8514db6a42148d5095fc", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-ppc64le" + "sha256": "76981fe4b032385752c5bb07144a22a7dfb599da15eca6fa1775e94364833475", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "00302be14ad7d981eb86b834c09deb8186231b416c16454f9971bfcc0ec7e22f", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-riscv64" + "sha256": "1ee27dd153bd796686ece5d1829266b9b0db0a2ed67e7dbef023457da6dc5761", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "323c2e92b3150ef94dc4201770e06ed7bacbe811abd77a23108cceea032fcf63", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-s390x" + "sha256": "9ee5fd812e7e52c08b95cd59673b956f2248343c2fb51eb8bcf635b02cfcbee4", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe" + "sha256": "13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "cbf63deac9f62fd6ff13c2c3f245f9da2668bbe4e590c60cf814ff37fbb500c6", - "url": "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-aarch64.exe" + "sha256": "f8abeebc8f07bbd010a8b595b32a34b9dc465fb52687be51d0805c773f39565a", + "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.23.0" + "version": "2.23.1" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From dfb1ba84af295e08daca9b97fed85900eab334c4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Nov 2023 15:55:14 -0800 Subject: [PATCH 238/667] Update 24 to buildx 0.12.0 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 98e72b54d..6fddab1b3 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -51,38 +51,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.11.2 +ENV DOCKER_BUILDX_VERSION 0.12.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64'; \ - sha256='311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-amd64'; \ + sha256='7c393b92c148a0ce26c76a2abc99960be1d1097f0471978d41dc51d0c1a4471e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6'; \ - sha256='c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v6'; \ + sha256='62d9162f526c3bb7f67768a5b0d81a8b3ad0371406dfc1f0775e4f62dfca7fe1'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7'; \ - sha256='4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v7'; \ + sha256='d941d6a5b072de775222d31d9f8467b4c1b1f56e3b08d1b78f828a9244c16464'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64'; \ - sha256='565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm64'; \ + sha256='781caebb36551b035cb9dcfaf91088543d09c73c4a2549341e6417d86b8bbb50'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le'; \ - sha256='c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-ppc64le'; \ + sha256='ab5bda4532528d6b0801c877999fce9def10c6a37624673fd13c668fdcde16b7'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64'; \ - sha256='c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-riscv64'; \ + sha256='a2b846919c44128c6db9165ad24545e7e10035b6f0ad01559fcfbb2a13017127'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x'; \ - sha256='02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-s390x'; \ + sha256='81c2ada65624e2ac6bb4123f3a3bb933d04cfb08aa45fc55dd201ba523d96d30'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 37eb2c493..29d60e8b8 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 +ENV DOCKER_BUILDX_VERSION 0.12.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 4c550fc20..7cf3d5adb 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 +ENV DOCKER_BUILDX_VERSION 0.12.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index efcf02bb6..b86d62c1d 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.11.2.linux-amd64", - "sha256": "311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64" + "file": "buildx-v0.12.0.linux-amd64", + "sha256": "7c393b92c148a0ce26c76a2abc99960be1d1097f0471978d41dc51d0c1a4471e", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.11.2.linux-arm-v6", - "sha256": "c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6" + "file": "buildx-v0.12.0.linux-arm-v6", + "sha256": "62d9162f526c3bb7f67768a5b0d81a8b3ad0371406dfc1f0775e4f62dfca7fe1", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.11.2.linux-arm-v7", - "sha256": "4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7" + "file": "buildx-v0.12.0.linux-arm-v7", + "sha256": "d941d6a5b072de775222d31d9f8467b4c1b1f56e3b08d1b78f828a9244c16464", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.11.2.linux-arm64", - "sha256": "565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64" + "file": "buildx-v0.12.0.linux-arm64", + "sha256": "781caebb36551b035cb9dcfaf91088543d09c73c4a2549341e6417d86b8bbb50", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.11.2.linux-ppc64le", - "sha256": "c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le" + "file": "buildx-v0.12.0.linux-ppc64le", + "sha256": "ab5bda4532528d6b0801c877999fce9def10c6a37624673fd13c668fdcde16b7", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.11.2.linux-riscv64", - "sha256": "c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64" + "file": "buildx-v0.12.0.linux-riscv64", + "sha256": "a2b846919c44128c6db9165ad24545e7e10035b6f0ad01559fcfbb2a13017127", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.11.2.linux-s390x", - "sha256": "02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x" + "file": "buildx-v0.12.0.linux-s390x", + "sha256": "81c2ada65624e2ac6bb4123f3a3bb933d04cfb08aa45fc55dd201ba523d96d30", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.11.2.windows-amd64.exe", - "sha256": "d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe" + "file": "buildx-v0.12.0.windows-amd64.exe", + "sha256": "dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.11.2.windows-arm64.exe", - "sha256": "9278cb193ca5d508ff632416c07712a7d128349a1b2ede3085456758e2f90d3f", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-arm64.exe" + "file": "buildx-v0.12.0.windows-arm64.exe", + "sha256": "3ace30ecc39b214f80d92c7750c5fc51510ca0eee234aa015d89929c531a22d3", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-arm64.exe" } }, - "version": "0.11.2" + "version": "0.12.0" }, "compose": { "arches": { From b8cd11e7dbf2cb9a6380b0979d6f735da0c9feb0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Nov 2023 15:56:41 -0800 Subject: [PATCH 239/667] Update 25-rc to buildx 0.12.0 --- 25-rc/cli/Dockerfile | 30 +++++----- .../windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 0a483895e..0fa1958be 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -51,38 +51,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.11.2 +ENV DOCKER_BUILDX_VERSION 0.12.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64'; \ - sha256='311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-amd64'; \ + sha256='7c393b92c148a0ce26c76a2abc99960be1d1097f0471978d41dc51d0c1a4471e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6'; \ - sha256='c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v6'; \ + sha256='62d9162f526c3bb7f67768a5b0d81a8b3ad0371406dfc1f0775e4f62dfca7fe1'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7'; \ - sha256='4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v7'; \ + sha256='d941d6a5b072de775222d31d9f8467b4c1b1f56e3b08d1b78f828a9244c16464'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64'; \ - sha256='565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm64'; \ + sha256='781caebb36551b035cb9dcfaf91088543d09c73c4a2549341e6417d86b8bbb50'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le'; \ - sha256='c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-ppc64le'; \ + sha256='ab5bda4532528d6b0801c877999fce9def10c6a37624673fd13c668fdcde16b7'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64'; \ - sha256='c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-riscv64'; \ + sha256='a2b846919c44128c6db9165ad24545e7e10035b6f0ad01559fcfbb2a13017127'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x'; \ - sha256='02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-s390x'; \ + sha256='81c2ada65624e2ac6bb4123f3a3bb933d04cfb08aa45fc55dd201ba523d96d30'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 0afe0e039..79989bd21 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 +ENV DOCKER_BUILDX_VERSION 0.12.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 575be9651..1beed10b9 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.11.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9 +ENV DOCKER_BUILDX_VERSION 0.12.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b86d62c1d..05a54a986 100644 --- a/versions.json +++ b/versions.json @@ -165,52 +165,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.11.2.linux-amd64", - "sha256": "311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-amd64" + "file": "buildx-v0.12.0.linux-amd64", + "sha256": "7c393b92c148a0ce26c76a2abc99960be1d1097f0471978d41dc51d0c1a4471e", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.11.2.linux-arm-v6", - "sha256": "c1bab0c7374406d5069f60b291971d71161fbd3c00e8a8fb1b68b9053eda8a4e", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v6" + "file": "buildx-v0.12.0.linux-arm-v6", + "sha256": "62d9162f526c3bb7f67768a5b0d81a8b3ad0371406dfc1f0775e4f62dfca7fe1", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.11.2.linux-arm-v7", - "sha256": "4defdf463ca2516d3f58fef69a6f78cbbb8baf16d936cdfc54df4a4be0d48f7f", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm-v7" + "file": "buildx-v0.12.0.linux-arm-v7", + "sha256": "d941d6a5b072de775222d31d9f8467b4c1b1f56e3b08d1b78f828a9244c16464", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.11.2.linux-arm64", - "sha256": "565e36085a35bba5104f37365ba796c111338eea1a0902b3a7ff42e2e1248815", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-arm64" + "file": "buildx-v0.12.0.linux-arm64", + "sha256": "781caebb36551b035cb9dcfaf91088543d09c73c4a2549341e6417d86b8bbb50", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.11.2.linux-ppc64le", - "sha256": "c5f5cb9957890873a537c7ff5c4eef36132339622baeabb37a4b9b7251ddf836", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-ppc64le" + "file": "buildx-v0.12.0.linux-ppc64le", + "sha256": "ab5bda4532528d6b0801c877999fce9def10c6a37624673fd13c668fdcde16b7", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.11.2.linux-riscv64", - "sha256": "c0adc4b4625f7e3df7dcdec840568f918673f2ed4bcd03ca1e63ea2a5627ca35", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-riscv64" + "file": "buildx-v0.12.0.linux-riscv64", + "sha256": "a2b846919c44128c6db9165ad24545e7e10035b6f0ad01559fcfbb2a13017127", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.11.2.linux-s390x", - "sha256": "02916c76c3872fd0b3fa57e71403fee92b6be10f350b96a5ff99e7914dd277b8", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.linux-s390x" + "file": "buildx-v0.12.0.linux-s390x", + "sha256": "81c2ada65624e2ac6bb4123f3a3bb933d04cfb08aa45fc55dd201ba523d96d30", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.11.2.windows-amd64.exe", - "sha256": "d9419c0838c8a08c2da28fcee585f48926c4dd64e5be1d96eb55da12fa3332d9", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-amd64.exe" + "file": "buildx-v0.12.0.windows-amd64.exe", + "sha256": "dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.11.2.windows-arm64.exe", - "sha256": "9278cb193ca5d508ff632416c07712a7d128349a1b2ede3085456758e2f90d3f", - "url": "https://github.com/docker/buildx/releases/download/v0.11.2/buildx-v0.11.2.windows-arm64.exe" + "file": "buildx-v0.12.0.windows-arm64.exe", + "sha256": "3ace30ecc39b214f80d92c7750c5fc51510ca0eee234aa015d89929c531a22d3", + "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-arm64.exe" } }, - "version": "0.11.2" + "version": "0.12.0" }, "compose": { "arches": { From f8c6008da28be76bd547390aeccf5d1a3e7c200b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 Nov 2023 10:04:14 -0800 Subject: [PATCH 240/667] Update 24 to compose 2.23.2 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 6fddab1b3..c5f46210f 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.23.1 +ENV DOCKER_COMPOSE_VERSION 2.23.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-x86_64'; \ - sha256='4f9b5313cf3eb1651b65aa6fc2fe1f59eb3812b7566f7c1b853be429b81bf3ab'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-x86_64'; \ + sha256='887bc7532f656779eaa855c4fa84569140a66627d284c54d95374c29ae3dc2de'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv6'; \ - sha256='44b679381da55d1a673e5e638ac6d34f81e38e58ac656c530e27bb57a0ef930d'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv6'; \ + sha256='832fc98b20cfb5b92e21af098ce4b81bc42c8ba470d539741fd515611f1a9d90'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv7'; \ - sha256='347b65d0cec622976bb753550d2708c8c9c760d55c1b5952a6800f5fadd4781c'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv7'; \ + sha256='f9f2fcc552d43a816831d325a56368e71f0edb11dc39ff269b58eccf855bb3a0'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-aarch64'; \ - sha256='27b3cb1f066cdba191c4df96255a3d7178294763c9d67fba528f769968fc2e65'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-aarch64'; \ + sha256='f0d0b5fb35b2cd06823d3838a5163067ae54b7663bafafc875b3dd73d12285f0'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-ppc64le'; \ - sha256='76981fe4b032385752c5bb07144a22a7dfb599da15eca6fa1775e94364833475'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-ppc64le'; \ + sha256='c771183a0e6f43123bc3b627124214519705ed65c55e16a22448587dabe53d9d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-riscv64'; \ - sha256='1ee27dd153bd796686ece5d1829266b9b0db0a2ed67e7dbef023457da6dc5761'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-riscv64'; \ + sha256='f5fbc33ab5ccf12a0c0f2eb852cb971093ff014e83e9092a3958efb2acd535ca'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-s390x'; \ - sha256='9ee5fd812e7e52c08b95cd59673b956f2248343c2fb51eb8bcf635b02cfcbee4'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-s390x'; \ + sha256='de48493b8b35b82af4e6cdabd4112a402e92d4fe0b79df892746bf4241c8d6c1'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 29d60e8b8..843673caa 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690 +ENV DOCKER_COMPOSE_VERSION 2.23.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 7cf3d5adb..f06ac3777 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690 +ENV DOCKER_COMPOSE_VERSION 2.23.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 05a54a986..f3464165c 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "4f9b5313cf3eb1651b65aa6fc2fe1f59eb3812b7566f7c1b853be429b81bf3ab", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-x86_64" + "sha256": "887bc7532f656779eaa855c4fa84569140a66627d284c54d95374c29ae3dc2de", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "44b679381da55d1a673e5e638ac6d34f81e38e58ac656c530e27bb57a0ef930d", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv6" + "sha256": "832fc98b20cfb5b92e21af098ce4b81bc42c8ba470d539741fd515611f1a9d90", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "347b65d0cec622976bb753550d2708c8c9c760d55c1b5952a6800f5fadd4781c", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv7" + "sha256": "f9f2fcc552d43a816831d325a56368e71f0edb11dc39ff269b58eccf855bb3a0", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "27b3cb1f066cdba191c4df96255a3d7178294763c9d67fba528f769968fc2e65", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-aarch64" + "sha256": "f0d0b5fb35b2cd06823d3838a5163067ae54b7663bafafc875b3dd73d12285f0", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "d4ebde5c4a6497a3a7dbac600ee235e7ac462a5366311f642eb7923d660c30c2", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-darwin-x86_64" + "sha256": "9dbd75f636f166266583bf09bcbfe15e10c57f7746e6067b63f9d8e32c13ed95", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "c756706b30016af4f62d44903fe4635fdfce04289f5ced98fd88d965a35fcad3", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-darwin-aarch64" + "sha256": "2bb280039d1db56fc10c5b991f473c2630b4d6afa81d7f1a63b08f7dec7fac85", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "76981fe4b032385752c5bb07144a22a7dfb599da15eca6fa1775e94364833475", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-ppc64le" + "sha256": "c771183a0e6f43123bc3b627124214519705ed65c55e16a22448587dabe53d9d", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "1ee27dd153bd796686ece5d1829266b9b0db0a2ed67e7dbef023457da6dc5761", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-riscv64" + "sha256": "f5fbc33ab5ccf12a0c0f2eb852cb971093ff014e83e9092a3958efb2acd535ca", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "9ee5fd812e7e52c08b95cd59673b956f2248343c2fb51eb8bcf635b02cfcbee4", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-s390x" + "sha256": "de48493b8b35b82af4e6cdabd4112a402e92d4fe0b79df892746bf4241c8d6c1", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe" + "sha256": "142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "f8abeebc8f07bbd010a8b595b32a34b9dc465fb52687be51d0805c773f39565a", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-aarch64.exe" + "sha256": "12db42bdf0aa08393126a830347e6f78ccb76f9cec742a0beba20737429a58f3", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.23.1" + "version": "2.23.2" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 728ab5358534ea1297c4dc044fbc9560cbf3b8c1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 Nov 2023 10:05:54 -0800 Subject: [PATCH 241/667] Update 25-rc to compose 2.23.2 --- 25-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 0fa1958be..aad6cd0a1 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.23.1 +ENV DOCKER_COMPOSE_VERSION 2.23.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-x86_64'; \ - sha256='4f9b5313cf3eb1651b65aa6fc2fe1f59eb3812b7566f7c1b853be429b81bf3ab'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-x86_64'; \ + sha256='887bc7532f656779eaa855c4fa84569140a66627d284c54d95374c29ae3dc2de'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv6'; \ - sha256='44b679381da55d1a673e5e638ac6d34f81e38e58ac656c530e27bb57a0ef930d'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv6'; \ + sha256='832fc98b20cfb5b92e21af098ce4b81bc42c8ba470d539741fd515611f1a9d90'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv7'; \ - sha256='347b65d0cec622976bb753550d2708c8c9c760d55c1b5952a6800f5fadd4781c'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv7'; \ + sha256='f9f2fcc552d43a816831d325a56368e71f0edb11dc39ff269b58eccf855bb3a0'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-aarch64'; \ - sha256='27b3cb1f066cdba191c4df96255a3d7178294763c9d67fba528f769968fc2e65'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-aarch64'; \ + sha256='f0d0b5fb35b2cd06823d3838a5163067ae54b7663bafafc875b3dd73d12285f0'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-ppc64le'; \ - sha256='76981fe4b032385752c5bb07144a22a7dfb599da15eca6fa1775e94364833475'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-ppc64le'; \ + sha256='c771183a0e6f43123bc3b627124214519705ed65c55e16a22448587dabe53d9d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-riscv64'; \ - sha256='1ee27dd153bd796686ece5d1829266b9b0db0a2ed67e7dbef023457da6dc5761'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-riscv64'; \ + sha256='f5fbc33ab5ccf12a0c0f2eb852cb971093ff014e83e9092a3958efb2acd535ca'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-s390x'; \ - sha256='9ee5fd812e7e52c08b95cd59673b956f2248343c2fb51eb8bcf635b02cfcbee4'; \ + url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-s390x'; \ + sha256='de48493b8b35b82af4e6cdabd4112a402e92d4fe0b79df892746bf4241c8d6c1'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 79989bd21..0fc8ce594 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690 +ENV DOCKER_COMPOSE_VERSION 2.23.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 1beed10b9..0752c4404 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690 +ENV DOCKER_COMPOSE_VERSION 2.23.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f3464165c..9925cba1c 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "4f9b5313cf3eb1651b65aa6fc2fe1f59eb3812b7566f7c1b853be429b81bf3ab", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-x86_64" + "sha256": "887bc7532f656779eaa855c4fa84569140a66627d284c54d95374c29ae3dc2de", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "44b679381da55d1a673e5e638ac6d34f81e38e58ac656c530e27bb57a0ef930d", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv6" + "sha256": "832fc98b20cfb5b92e21af098ce4b81bc42c8ba470d539741fd515611f1a9d90", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "347b65d0cec622976bb753550d2708c8c9c760d55c1b5952a6800f5fadd4781c", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-armv7" + "sha256": "f9f2fcc552d43a816831d325a56368e71f0edb11dc39ff269b58eccf855bb3a0", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "27b3cb1f066cdba191c4df96255a3d7178294763c9d67fba528f769968fc2e65", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-aarch64" + "sha256": "f0d0b5fb35b2cd06823d3838a5163067ae54b7663bafafc875b3dd73d12285f0", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "d4ebde5c4a6497a3a7dbac600ee235e7ac462a5366311f642eb7923d660c30c2", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-darwin-x86_64" + "sha256": "9dbd75f636f166266583bf09bcbfe15e10c57f7746e6067b63f9d8e32c13ed95", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "c756706b30016af4f62d44903fe4635fdfce04289f5ced98fd88d965a35fcad3", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-darwin-aarch64" + "sha256": "2bb280039d1db56fc10c5b991f473c2630b4d6afa81d7f1a63b08f7dec7fac85", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "76981fe4b032385752c5bb07144a22a7dfb599da15eca6fa1775e94364833475", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-ppc64le" + "sha256": "c771183a0e6f43123bc3b627124214519705ed65c55e16a22448587dabe53d9d", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "1ee27dd153bd796686ece5d1829266b9b0db0a2ed67e7dbef023457da6dc5761", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-riscv64" + "sha256": "f5fbc33ab5ccf12a0c0f2eb852cb971093ff014e83e9092a3958efb2acd535ca", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "9ee5fd812e7e52c08b95cd59673b956f2248343c2fb51eb8bcf635b02cfcbee4", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-linux-s390x" + "sha256": "de48493b8b35b82af4e6cdabd4112a402e92d4fe0b79df892746bf4241c8d6c1", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "13c59f3ee44ec4053239162834f185eccac58f92a02ce0bd2f77ff5d0539b690", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-x86_64.exe" + "sha256": "142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "f8abeebc8f07bbd010a8b595b32a34b9dc465fb52687be51d0805c773f39565a", - "url": "https://github.com/docker/compose/releases/download/v2.23.1/docker-compose-windows-aarch64.exe" + "sha256": "12db42bdf0aa08393126a830347e6f78ccb76f9cec742a0beba20737429a58f3", + "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.23.1" + "version": "2.23.2" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 6d541d27b5dd12639e5a33a675ebca04d3837d74 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 23 Nov 2023 04:04:14 -0800 Subject: [PATCH 242/667] Update 24 to compose 2.23.3 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index c5f46210f..3f2960ac4 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.23.2 +ENV DOCKER_COMPOSE_VERSION 2.23.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-x86_64'; \ - sha256='887bc7532f656779eaa855c4fa84569140a66627d284c54d95374c29ae3dc2de'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64'; \ + sha256='a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv6'; \ - sha256='832fc98b20cfb5b92e21af098ce4b81bc42c8ba470d539741fd515611f1a9d90'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6'; \ + sha256='b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv7'; \ - sha256='f9f2fcc552d43a816831d325a56368e71f0edb11dc39ff269b58eccf855bb3a0'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7'; \ + sha256='4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-aarch64'; \ - sha256='f0d0b5fb35b2cd06823d3838a5163067ae54b7663bafafc875b3dd73d12285f0'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64'; \ + sha256='71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-ppc64le'; \ - sha256='c771183a0e6f43123bc3b627124214519705ed65c55e16a22448587dabe53d9d'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le'; \ + sha256='6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-riscv64'; \ - sha256='f5fbc33ab5ccf12a0c0f2eb852cb971093ff014e83e9092a3958efb2acd535ca'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64'; \ + sha256='3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-s390x'; \ - sha256='de48493b8b35b82af4e6cdabd4112a402e92d4fe0b79df892746bf4241c8d6c1'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x'; \ + sha256='2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 843673caa..d0323e670 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f +ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index f06ac3777..25fafca4b 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f +ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 9925cba1c..a3d80532e 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "887bc7532f656779eaa855c4fa84569140a66627d284c54d95374c29ae3dc2de", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-x86_64" + "sha256": "a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "832fc98b20cfb5b92e21af098ce4b81bc42c8ba470d539741fd515611f1a9d90", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv6" + "sha256": "b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "f9f2fcc552d43a816831d325a56368e71f0edb11dc39ff269b58eccf855bb3a0", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv7" + "sha256": "4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "f0d0b5fb35b2cd06823d3838a5163067ae54b7663bafafc875b3dd73d12285f0", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-aarch64" + "sha256": "71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9dbd75f636f166266583bf09bcbfe15e10c57f7746e6067b63f9d8e32c13ed95", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-darwin-x86_64" + "sha256": "28f8f43ea4088562bba8a1977e0d4f3edeb7a45acb8e9c58be2b85325ce29450", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "2bb280039d1db56fc10c5b991f473c2630b4d6afa81d7f1a63b08f7dec7fac85", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-darwin-aarch64" + "sha256": "7212d93f2ffdd95f8929cf89ab95fa551895ef17077065cabb00f6f85633888b", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "c771183a0e6f43123bc3b627124214519705ed65c55e16a22448587dabe53d9d", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-ppc64le" + "sha256": "6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "f5fbc33ab5ccf12a0c0f2eb852cb971093ff014e83e9092a3958efb2acd535ca", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-riscv64" + "sha256": "3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "de48493b8b35b82af4e6cdabd4112a402e92d4fe0b79df892746bf4241c8d6c1", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-s390x" + "sha256": "2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe" + "sha256": "7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "12db42bdf0aa08393126a830347e6f78ccb76f9cec742a0beba20737429a58f3", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-aarch64.exe" + "sha256": "5e8fc62743039f3aa2e277f5dd66b00dd2acf1a6a94e0a22d98ce8750f935607", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.23.2" + "version": "2.23.3" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 01cebba606d33d2eeb9e3dcf52e4bf218913e211 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 23 Nov 2023 04:05:52 -0800 Subject: [PATCH 243/667] Update 25-rc to compose 2.23.3 --- 25-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index aad6cd0a1..ed976faba 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.23.2 +ENV DOCKER_COMPOSE_VERSION 2.23.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-x86_64'; \ - sha256='887bc7532f656779eaa855c4fa84569140a66627d284c54d95374c29ae3dc2de'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64'; \ + sha256='a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv6'; \ - sha256='832fc98b20cfb5b92e21af098ce4b81bc42c8ba470d539741fd515611f1a9d90'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6'; \ + sha256='b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv7'; \ - sha256='f9f2fcc552d43a816831d325a56368e71f0edb11dc39ff269b58eccf855bb3a0'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7'; \ + sha256='4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-aarch64'; \ - sha256='f0d0b5fb35b2cd06823d3838a5163067ae54b7663bafafc875b3dd73d12285f0'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64'; \ + sha256='71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-ppc64le'; \ - sha256='c771183a0e6f43123bc3b627124214519705ed65c55e16a22448587dabe53d9d'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le'; \ + sha256='6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-riscv64'; \ - sha256='f5fbc33ab5ccf12a0c0f2eb852cb971093ff014e83e9092a3958efb2acd535ca'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64'; \ + sha256='3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-s390x'; \ - sha256='de48493b8b35b82af4e6cdabd4112a402e92d4fe0b79df892746bf4241c8d6c1'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x'; \ + sha256='2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 0fc8ce594..37d3d43c8 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f +ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 0752c4404..8a5b0078b 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f +ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index a3d80532e..bfdf18cb8 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "887bc7532f656779eaa855c4fa84569140a66627d284c54d95374c29ae3dc2de", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-x86_64" + "sha256": "a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "832fc98b20cfb5b92e21af098ce4b81bc42c8ba470d539741fd515611f1a9d90", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv6" + "sha256": "b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "f9f2fcc552d43a816831d325a56368e71f0edb11dc39ff269b58eccf855bb3a0", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-armv7" + "sha256": "4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "f0d0b5fb35b2cd06823d3838a5163067ae54b7663bafafc875b3dd73d12285f0", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-aarch64" + "sha256": "71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9dbd75f636f166266583bf09bcbfe15e10c57f7746e6067b63f9d8e32c13ed95", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-darwin-x86_64" + "sha256": "28f8f43ea4088562bba8a1977e0d4f3edeb7a45acb8e9c58be2b85325ce29450", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "2bb280039d1db56fc10c5b991f473c2630b4d6afa81d7f1a63b08f7dec7fac85", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-darwin-aarch64" + "sha256": "7212d93f2ffdd95f8929cf89ab95fa551895ef17077065cabb00f6f85633888b", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "c771183a0e6f43123bc3b627124214519705ed65c55e16a22448587dabe53d9d", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-ppc64le" + "sha256": "6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "f5fbc33ab5ccf12a0c0f2eb852cb971093ff014e83e9092a3958efb2acd535ca", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-riscv64" + "sha256": "3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "de48493b8b35b82af4e6cdabd4112a402e92d4fe0b79df892746bf4241c8d6c1", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-linux-s390x" + "sha256": "2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "142ba2a18b2f2a44b49f7b0884742768c00cb25a6cf4b32d3d94eb2b8b4bc25f", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-x86_64.exe" + "sha256": "7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "12db42bdf0aa08393126a830347e6f78ccb76f9cec742a0beba20737429a58f3", - "url": "https://github.com/docker/compose/releases/download/v2.23.2/docker-compose-windows-aarch64.exe" + "sha256": "5e8fc62743039f3aa2e277f5dd66b00dd2acf1a6a94e0a22d98ce8750f935607", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.23.2" + "version": "2.23.3" }, "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", "variants": [ From 99073a3b6be3aa7e6b5af1e69509e8c532254500 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 27 Nov 2023 16:04:30 -0800 Subject: [PATCH 244/667] Update 24 --- 24/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index 835b17abf..064a9a4bf 100644 --- a/24/dind/Dockerfile +++ b/24/dind/Dockerfile @@ -74,7 +74,7 @@ RUN set -eux; \ runc --version # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT d58df1fc6c866447ce2cd129af10e5b507705624 +ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index bfdf18cb8..da249d6c1 100644 --- a/versions.json +++ b/versions.json @@ -129,7 +129,7 @@ }, "version": "2.23.3" }, - "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", + "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ "cli", "dind", From 5c2833e7ce9e5af0921154416d59ee13c6185cbf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 27 Nov 2023 16:06:31 -0800 Subject: [PATCH 245/667] Update 25-rc --- 25-rc/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/25-rc/dind/Dockerfile b/25-rc/dind/Dockerfile index c55020780..877ce4d5d 100644 --- a/25-rc/dind/Dockerfile +++ b/25-rc/dind/Dockerfile @@ -74,7 +74,7 @@ RUN set -eux; \ runc --version # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT d58df1fc6c866447ce2cd129af10e5b507705624 +ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index da249d6c1..1fca5698a 100644 --- a/versions.json +++ b/versions.json @@ -272,7 +272,7 @@ }, "version": "2.23.3" }, - "dindCommit": "d58df1fc6c866447ce2cd129af10e5b507705624", + "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ "cli", "dind", From 797b2440af15800affd9fbce1e1de589423ac125 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 11 Dec 2023 10:04:14 -0800 Subject: [PATCH 246/667] Update 24 to compose 2.24.0-birthday.10 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 3f2960ac4..a76497b3a 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64'; \ - sha256='a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-x86_64'; \ + sha256='0994ee79cf37e18c346d50d34a32afed2a256fd8f25d4742f8967bf0282a8f74'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6'; \ - sha256='b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv6'; \ + sha256='0d31d43dfa3c2543e2d5ce678feb9322eeeb157aa690aabcd7e1ad1706f1957f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7'; \ - sha256='4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv7'; \ + sha256='9c21edd45bb53d0fb0de2cde7119c79b8e0a54f459dd28415368e57d38d71631'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64'; \ - sha256='71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-aarch64'; \ + sha256='8feede4f79409aa21c9671cf56cf020220a2f443e24c38484765913cbacc6cba'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le'; \ - sha256='6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-ppc64le'; \ + sha256='89095dddb823a44d421185ec1ede768a7838bfb8e1c9555242f428cb0729bb91'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64'; \ - sha256='3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-riscv64'; \ + sha256='52e2adc20c0eb6f898ddb61de377d7b6c4360e31a8e8315529a26429712c15c2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x'; \ - sha256='2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-s390x'; \ + sha256='9b413526d4c26fa2ef523dfa8b7a685a330e9d47914e362d7edc4c011974860b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index d0323e670..5dd24fdff 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 +ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 25fafca4b..99d9dfe10 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 +ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 1fca5698a..538ef55e0 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64" + "sha256": "0994ee79cf37e18c346d50d34a32afed2a256fd8f25d4742f8967bf0282a8f74", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6" + "sha256": "0d31d43dfa3c2543e2d5ce678feb9322eeeb157aa690aabcd7e1ad1706f1957f", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7" + "sha256": "9c21edd45bb53d0fb0de2cde7119c79b8e0a54f459dd28415368e57d38d71631", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64" + "sha256": "8feede4f79409aa21c9671cf56cf020220a2f443e24c38484765913cbacc6cba", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "28f8f43ea4088562bba8a1977e0d4f3edeb7a45acb8e9c58be2b85325ce29450", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-x86_64" + "sha256": "1d483cd71b5913fb4e3a7ee3eef74cffbe614fd0affd89107614599d9b41640c", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7212d93f2ffdd95f8929cf89ab95fa551895ef17077065cabb00f6f85633888b", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-aarch64" + "sha256": "d7d0359e66020fb43b13a42756d6068c17971f76ff167f9d89c669d2a82503c1", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le" + "sha256": "89095dddb823a44d421185ec1ede768a7838bfb8e1c9555242f428cb0729bb91", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64" + "sha256": "52e2adc20c0eb6f898ddb61de377d7b6c4360e31a8e8315529a26429712c15c2", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x" + "sha256": "9b413526d4c26fa2ef523dfa8b7a685a330e9d47914e362d7edc4c011974860b", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe" + "sha256": "33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "5e8fc62743039f3aa2e277f5dd66b00dd2acf1a6a94e0a22d98ce8750f935607", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-aarch64.exe" + "sha256": "ab5303c2a7021310ff69fc2c6e5a4e87292a8e7a9d4bcd8f5609c88dab1df55a", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-aarch64.exe" } }, - "version": "2.23.3" + "version": "2.24.0-birthday.10" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 069c4918bee40463ca23c5eb420c65c6f722b664 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 11 Dec 2023 10:06:12 -0800 Subject: [PATCH 247/667] Update 25-rc to compose 2.24.0-birthday.10 --- 25-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index ed976faba..7f725799d 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64'; \ - sha256='a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-x86_64'; \ + sha256='0994ee79cf37e18c346d50d34a32afed2a256fd8f25d4742f8967bf0282a8f74'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6'; \ - sha256='b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv6'; \ + sha256='0d31d43dfa3c2543e2d5ce678feb9322eeeb157aa690aabcd7e1ad1706f1957f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7'; \ - sha256='4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv7'; \ + sha256='9c21edd45bb53d0fb0de2cde7119c79b8e0a54f459dd28415368e57d38d71631'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64'; \ - sha256='71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-aarch64'; \ + sha256='8feede4f79409aa21c9671cf56cf020220a2f443e24c38484765913cbacc6cba'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le'; \ - sha256='6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-ppc64le'; \ + sha256='89095dddb823a44d421185ec1ede768a7838bfb8e1c9555242f428cb0729bb91'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64'; \ - sha256='3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-riscv64'; \ + sha256='52e2adc20c0eb6f898ddb61de377d7b6c4360e31a8e8315529a26429712c15c2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x'; \ - sha256='2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-s390x'; \ + sha256='9b413526d4c26fa2ef523dfa8b7a685a330e9d47914e362d7edc4c011974860b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 37d3d43c8..05730d9db 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 +ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 8a5b0078b..81f9f595a 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 +ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 538ef55e0..06210e06e 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64" + "sha256": "0994ee79cf37e18c346d50d34a32afed2a256fd8f25d4742f8967bf0282a8f74", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6" + "sha256": "0d31d43dfa3c2543e2d5ce678feb9322eeeb157aa690aabcd7e1ad1706f1957f", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7" + "sha256": "9c21edd45bb53d0fb0de2cde7119c79b8e0a54f459dd28415368e57d38d71631", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64" + "sha256": "8feede4f79409aa21c9671cf56cf020220a2f443e24c38484765913cbacc6cba", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "28f8f43ea4088562bba8a1977e0d4f3edeb7a45acb8e9c58be2b85325ce29450", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-x86_64" + "sha256": "1d483cd71b5913fb4e3a7ee3eef74cffbe614fd0affd89107614599d9b41640c", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7212d93f2ffdd95f8929cf89ab95fa551895ef17077065cabb00f6f85633888b", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-aarch64" + "sha256": "d7d0359e66020fb43b13a42756d6068c17971f76ff167f9d89c669d2a82503c1", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le" + "sha256": "89095dddb823a44d421185ec1ede768a7838bfb8e1c9555242f428cb0729bb91", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64" + "sha256": "52e2adc20c0eb6f898ddb61de377d7b6c4360e31a8e8315529a26429712c15c2", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x" + "sha256": "9b413526d4c26fa2ef523dfa8b7a685a330e9d47914e362d7edc4c011974860b", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe" + "sha256": "33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "5e8fc62743039f3aa2e277f5dd66b00dd2acf1a6a94e0a22d98ce8750f935607", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-aarch64.exe" + "sha256": "ab5303c2a7021310ff69fc2c6e5a4e87292a8e7a9d4bcd8f5609c88dab1df55a", + "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-aarch64.exe" } }, - "version": "2.23.3" + "version": "2.24.0-birthday.10" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 71bd9300d17fb5b0722360fa298d9eace51c27c4 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 11 Dec 2023 15:07:50 -0800 Subject: [PATCH 248/667] Adjust Compose version code to ignore pre-releases more aggressively (downgrading back to 2.23.3) --- 24/cli/Dockerfile | 30 +++--- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- 25-rc/cli/Dockerfile | 30 +++--- .../windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 92 +++++++++---------- versions.sh | 2 +- 8 files changed, 89 insertions(+), 89 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index a76497b3a..3f2960ac4 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 +ENV DOCKER_COMPOSE_VERSION 2.23.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-x86_64'; \ - sha256='0994ee79cf37e18c346d50d34a32afed2a256fd8f25d4742f8967bf0282a8f74'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64'; \ + sha256='a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv6'; \ - sha256='0d31d43dfa3c2543e2d5ce678feb9322eeeb157aa690aabcd7e1ad1706f1957f'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6'; \ + sha256='b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv7'; \ - sha256='9c21edd45bb53d0fb0de2cde7119c79b8e0a54f459dd28415368e57d38d71631'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7'; \ + sha256='4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-aarch64'; \ - sha256='8feede4f79409aa21c9671cf56cf020220a2f443e24c38484765913cbacc6cba'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64'; \ + sha256='71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-ppc64le'; \ - sha256='89095dddb823a44d421185ec1ede768a7838bfb8e1c9555242f428cb0729bb91'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le'; \ + sha256='6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-riscv64'; \ - sha256='52e2adc20c0eb6f898ddb61de377d7b6c4360e31a8e8315529a26429712c15c2'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64'; \ + sha256='3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-s390x'; \ - sha256='9b413526d4c26fa2ef523dfa8b7a685a330e9d47914e362d7edc4c011974860b'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x'; \ + sha256='2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 5dd24fdff..d0323e670 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b +ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 99d9dfe10..25fafca4b 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b +ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 7f725799d..ed976faba 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -97,38 +97,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 +ENV DOCKER_COMPOSE_VERSION 2.23.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-x86_64'; \ - sha256='0994ee79cf37e18c346d50d34a32afed2a256fd8f25d4742f8967bf0282a8f74'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64'; \ + sha256='a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv6'; \ - sha256='0d31d43dfa3c2543e2d5ce678feb9322eeeb157aa690aabcd7e1ad1706f1957f'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6'; \ + sha256='b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv7'; \ - sha256='9c21edd45bb53d0fb0de2cde7119c79b8e0a54f459dd28415368e57d38d71631'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7'; \ + sha256='4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-aarch64'; \ - sha256='8feede4f79409aa21c9671cf56cf020220a2f443e24c38484765913cbacc6cba'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64'; \ + sha256='71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-ppc64le'; \ - sha256='89095dddb823a44d421185ec1ede768a7838bfb8e1c9555242f428cb0729bb91'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le'; \ + sha256='6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-riscv64'; \ - sha256='52e2adc20c0eb6f898ddb61de377d7b6c4360e31a8e8315529a26429712c15c2'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64'; \ + sha256='3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-s390x'; \ - sha256='9b413526d4c26fa2ef523dfa8b7a685a330e9d47914e362d7edc4c011974860b'; \ + url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x'; \ + sha256='2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 05730d9db..37d3d43c8 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b +ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 81f9f595a..8a5b0078b 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.0-birthday.10 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b +ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 06210e06e..1fca5698a 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "0994ee79cf37e18c346d50d34a32afed2a256fd8f25d4742f8967bf0282a8f74", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-x86_64" + "sha256": "a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "0d31d43dfa3c2543e2d5ce678feb9322eeeb157aa690aabcd7e1ad1706f1957f", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv6" + "sha256": "b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9c21edd45bb53d0fb0de2cde7119c79b8e0a54f459dd28415368e57d38d71631", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv7" + "sha256": "4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "8feede4f79409aa21c9671cf56cf020220a2f443e24c38484765913cbacc6cba", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-aarch64" + "sha256": "71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "1d483cd71b5913fb4e3a7ee3eef74cffbe614fd0affd89107614599d9b41640c", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-darwin-x86_64" + "sha256": "28f8f43ea4088562bba8a1977e0d4f3edeb7a45acb8e9c58be2b85325ce29450", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "d7d0359e66020fb43b13a42756d6068c17971f76ff167f9d89c669d2a82503c1", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-darwin-aarch64" + "sha256": "7212d93f2ffdd95f8929cf89ab95fa551895ef17077065cabb00f6f85633888b", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "89095dddb823a44d421185ec1ede768a7838bfb8e1c9555242f428cb0729bb91", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-ppc64le" + "sha256": "6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "52e2adc20c0eb6f898ddb61de377d7b6c4360e31a8e8315529a26429712c15c2", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-riscv64" + "sha256": "3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "9b413526d4c26fa2ef523dfa8b7a685a330e9d47914e362d7edc4c011974860b", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-s390x" + "sha256": "2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe" + "sha256": "7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "ab5303c2a7021310ff69fc2c6e5a4e87292a8e7a9d4bcd8f5609c88dab1df55a", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-aarch64.exe" + "sha256": "5e8fc62743039f3aa2e277f5dd66b00dd2acf1a6a94e0a22d98ce8750f935607", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.0-birthday.10" + "version": "2.23.3" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "0994ee79cf37e18c346d50d34a32afed2a256fd8f25d4742f8967bf0282a8f74", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-x86_64" + "sha256": "a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "0d31d43dfa3c2543e2d5ce678feb9322eeeb157aa690aabcd7e1ad1706f1957f", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv6" + "sha256": "b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9c21edd45bb53d0fb0de2cde7119c79b8e0a54f459dd28415368e57d38d71631", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-armv7" + "sha256": "4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "8feede4f79409aa21c9671cf56cf020220a2f443e24c38484765913cbacc6cba", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-aarch64" + "sha256": "71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "1d483cd71b5913fb4e3a7ee3eef74cffbe614fd0affd89107614599d9b41640c", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-darwin-x86_64" + "sha256": "28f8f43ea4088562bba8a1977e0d4f3edeb7a45acb8e9c58be2b85325ce29450", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "d7d0359e66020fb43b13a42756d6068c17971f76ff167f9d89c669d2a82503c1", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-darwin-aarch64" + "sha256": "7212d93f2ffdd95f8929cf89ab95fa551895ef17077065cabb00f6f85633888b", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "89095dddb823a44d421185ec1ede768a7838bfb8e1c9555242f428cb0729bb91", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-ppc64le" + "sha256": "6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "52e2adc20c0eb6f898ddb61de377d7b6c4360e31a8e8315529a26429712c15c2", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-riscv64" + "sha256": "3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "9b413526d4c26fa2ef523dfa8b7a685a330e9d47914e362d7edc4c011974860b", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-linux-s390x" + "sha256": "2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "33bb824203ffd7a363bf213ec5c20615a107aa723fbefbc67937bbff9f44394b", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-x86_64.exe" + "sha256": "7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "ab5303c2a7021310ff69fc2c6e5a4e87292a8e7a9d4bcd8f5609c88dab1df55a", - "url": "https://github.com/docker/compose/releases/download/v2.24.0-birthday.10/docker-compose-windows-aarch64.exe" + "sha256": "5e8fc62743039f3aa2e277f5dd66b00dd2acf1a6a94e0a22d98ce8750f935607", + "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.0-birthday.10" + "version": "2.23.3" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ diff --git a/versions.sh b/versions.sh index 44274cd57..e1bf411a8 100755 --- a/versions.sh +++ b/versions.sh @@ -119,7 +119,7 @@ composeVersions="$( | cut -d$'\t' -f2 \ | grep '^refs/tags/v[0-9].*$' \ | sed 's!^refs/tags/v!!; s!\^{}$!!' \ - | grep -vE -- '-rc' \ + | grep -vE -- '-[a-zA-Z]' \ | sort -ruV )" compose= From d8b20e0d84b8bac8629e782e0fc779d537eab8d8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 12 Dec 2023 15:39:18 -0800 Subject: [PATCH 249/667] Update 25-rc to 25.0.0-beta.2 --- 25-rc/cli/Dockerfile | 10 +++++----- 25-rc/dind-rootless/Dockerfile | 4 ++-- 25-rc/dind/Dockerfile | 8 ++++---- 25-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index ed976faba..759ac327a 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/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 25.0.0-beta.1 +ENV DOCKER_VERSION 25.0.0-beta.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind-rootless/Dockerfile b/25-rc/dind-rootless/Dockerfile index 4f826c2f9..70a87b821 100644 --- a/25-rc/dind-rootless/Dockerfile +++ b/25-rc/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/test/x86_64/docker-rootless-extras-25.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-beta.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind/Dockerfile b/25-rc/dind/Dockerfile index 877ce4d5d..6e1182008 100644 --- a/25-rc/dind/Dockerfile +++ b/25-rc/dind/Dockerfile @@ -42,16 +42,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 37d3d43c8..4fd5fc865 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/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 25.0.0-beta.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.1.zip +ENV DOCKER_VERSION 25.0.0-beta.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.2.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/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 8a5b0078b..0ab63b423 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/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 25.0.0-beta.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.1.zip +ENV DOCKER_VERSION 25.0.0-beta.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.2.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/versions.json b/versions.json index 1fca5698a..63738ab0e 100644 --- a/versions.json +++ b/versions.json @@ -145,21 +145,21 @@ "25-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-beta.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.2.zip" } }, "buildx": { @@ -281,6 +281,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "25.0.0-beta.1" + "version": "25.0.0-beta.2" } } From 9ebd7f6d5a3f26f47d627d0d7510f4b05fc9e977 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 13 Dec 2023 14:43:27 -0800 Subject: [PATCH 250/667] Add a "docker" group (with GID 2375) --- 24/cli/Dockerfile | 4 ++++ 25-rc/cli/Dockerfile | 4 ++++ Dockerfile-cli.template | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 3f2960ac4..168770b3e 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -17,6 +17,10 @@ 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 +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + ENV DOCKER_VERSION 24.0.7 RUN set -eux; \ diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 759ac327a..b524e59c3 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -17,6 +17,10 @@ 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 +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + ENV DOCKER_VERSION 25.0.0-beta.2 RUN set -eux; \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 1ae00e841..7f8c65d66 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -12,6 +12,10 @@ 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 +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + ENV DOCKER_VERSION {{ .version }} RUN set -eux; \ From 07fb6c2a4d3cadd9996ed436b991c8413aafce49 Mon Sep 17 00:00:00 2001 From: Aaron Dewes Date: Mon, 14 Aug 2023 08:25:58 +0200 Subject: [PATCH 251/667] Load nf_tables in preparation of Alpine 3.19 https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/47102 changes the default iptables backend to nf_tables. To prepare for the change (and to make sure it's not forgotten once DinD is updated), load nf_tables into the kernel. --- 24/dind/dockerd-entrypoint.sh | 1 + 25-rc/dind/dockerd-entrypoint.sh | 1 + dockerd-entrypoint.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/24/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh index 00819384b..60a4f5627 100755 --- a/24/dind/dockerd-entrypoint.sh +++ b/24/dind/dockerd-entrypoint.sh @@ -148,6 +148,7 @@ if [ "$1" = 'dockerd' ]; then # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 modprobe ip_tables || : + modprobe nf_tables || : fi uid="$(id -u)" diff --git a/25-rc/dind/dockerd-entrypoint.sh b/25-rc/dind/dockerd-entrypoint.sh index 00819384b..60a4f5627 100755 --- a/25-rc/dind/dockerd-entrypoint.sh +++ b/25-rc/dind/dockerd-entrypoint.sh @@ -148,6 +148,7 @@ if [ "$1" = 'dockerd' ]; then # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 modprobe ip_tables || : + modprobe nf_tables || : fi uid="$(id -u)" diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 00819384b..60a4f5627 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -148,6 +148,7 @@ if [ "$1" = 'dockerd' ]; then # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 modprobe ip_tables || : + modprobe nf_tables || : fi uid="$(id -u)" From 4c2674df4f40c965cdb8ccc77b8ce9dbc247a6c9 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 14 Dec 2023 10:13:53 +0100 Subject: [PATCH 252/667] Remove ip_tables in favor of nf_tables in dockerd entrypoint fallback --- 24/dind/dockerd-entrypoint.sh | 2 +- 25-rc/dind/dockerd-entrypoint.sh | 2 +- dockerd-entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/24/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh index 60a4f5627..056ee2ae0 100755 --- a/24/dind/dockerd-entrypoint.sh +++ b/24/dind/dockerd-entrypoint.sh @@ -147,7 +147,7 @@ if [ "$1" = 'dockerd' ]; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 - modprobe ip_tables || : + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 modprobe nf_tables || : fi diff --git a/25-rc/dind/dockerd-entrypoint.sh b/25-rc/dind/dockerd-entrypoint.sh index 60a4f5627..056ee2ae0 100755 --- a/25-rc/dind/dockerd-entrypoint.sh +++ b/25-rc/dind/dockerd-entrypoint.sh @@ -147,7 +147,7 @@ if [ "$1" = 'dockerd' ]; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 - modprobe ip_tables || : + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 modprobe nf_tables || : fi diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 60a4f5627..056ee2ae0 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -147,7 +147,7 @@ if [ "$1" = 'dockerd' ]; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 - modprobe ip_tables || : + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 modprobe nf_tables || : fi From 18bbfb7d201fc854d6bf9ee589f55290a543f209 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 7 Dec 2023 10:54:36 +0100 Subject: [PATCH 253/667] Update to Alpine 3.19 --- 24/cli/Dockerfile | 2 +- 25-rc/cli/Dockerfile | 2 +- Dockerfile-cli.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 3f2960ac4..f385b9608 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache \ ca-certificates \ diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 759ac327a..b1ac0aa74 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache \ ca-certificates \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 1ae00e841..05c75697b 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -1,5 +1,5 @@ {{ include "shared" -}} -FROM alpine:3.18 +FROM alpine:3.19 RUN apk add --no-cache \ ca-certificates \ From 7ac5702b51ae559c03bfe90404f4b8c63977c601 Mon Sep 17 00:00:00 2001 From: Albin Kerouanton <557933+akerouanton@users.noreply.github.com> Date: Fri, 15 Dec 2023 19:52:20 +0100 Subject: [PATCH 254/667] Switch over to xtables-legacy when nf_tables module isn't available (#465) * Switch over to xtables-legacy when nf_tables module isn't available PR 461 updated Alpine to 3.19 and made a change to load the nf_tables kernel module if needed. However, as demonstrated by 463 and 464 this might break when the host system doesn't have the nf_tables module available. In that case, we should still try to load the ip_tables module and symlink /sbin/iptables to xtables-legacy-multi. Signed-off-by: Albin Kerouanton * Adjust iptables-legacy fallback implementation to use an image-provided symlink farm instead of symlinking over package-provided files in /sbin/ at runtime --------- Signed-off-by: Albin Kerouanton Co-authored-by: Tianon Gravi --- 24/dind/Dockerfile | 25 +++++++++++++++++++++++++ 24/dind/dockerd-entrypoint.sh | 8 ++++++-- 25-rc/dind/Dockerfile | 25 +++++++++++++++++++++++++ 25-rc/dind/dockerd-entrypoint.sh | 8 ++++++-- Dockerfile-dind.template | 25 +++++++++++++++++++++++++ dockerd-entrypoint.sh | 8 ++++++-- 6 files changed, 93 insertions(+), 6 deletions(-) diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index 064a9a4bf..1cb755153 100644 --- a/24/dind/Dockerfile +++ b/24/dind/Dockerfile @@ -30,6 +30,31 @@ RUN set -eux; \ # TODO aufs-tools +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 + b="/sbin/${f/tables/tables-legacy}"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + # set up subuid/subgid so that "--userns-remap=default" works out-of-the-box RUN set -eux; \ addgroup -S dockremap; \ diff --git a/24/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh index 056ee2ae0..c15a62417 100755 --- a/24/dind/dockerd-entrypoint.sh +++ b/24/dind/dockerd-entrypoint.sh @@ -144,11 +144,15 @@ if [ "$1" = 'dockerd' ]; then set -- docker-init -- "$@" if ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : + if ! modprobe nf_tables; then + modprobe ip_tables || : + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi fi uid="$(id -u)" diff --git a/25-rc/dind/Dockerfile b/25-rc/dind/Dockerfile index 6e1182008..72f8279f5 100644 --- a/25-rc/dind/Dockerfile +++ b/25-rc/dind/Dockerfile @@ -30,6 +30,31 @@ RUN set -eux; \ # TODO aufs-tools +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 + b="/sbin/${f/tables/tables-legacy}"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + # set up subuid/subgid so that "--userns-remap=default" works out-of-the-box RUN set -eux; \ addgroup -S dockremap; \ diff --git a/25-rc/dind/dockerd-entrypoint.sh b/25-rc/dind/dockerd-entrypoint.sh index 056ee2ae0..c15a62417 100755 --- a/25-rc/dind/dockerd-entrypoint.sh +++ b/25-rc/dind/dockerd-entrypoint.sh @@ -144,11 +144,15 @@ if [ "$1" = 'dockerd' ]; then set -- docker-init -- "$@" if ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : + if ! modprobe nf_tables; then + modprobe ip_tables || : + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi fi uid="$(id -u)" diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index f8b585328..881ea6333 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -25,6 +25,31 @@ RUN set -eux; \ # TODO aufs-tools +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 + b="/sbin/${f/tables/tables-legacy}"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + # set up subuid/subgid so that "--userns-remap=default" works out-of-the-box RUN set -eux; \ addgroup -S dockremap; \ diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 056ee2ae0..c15a62417 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -144,11 +144,15 @@ if [ "$1" = 'dockerd' ]; then set -- docker-init -- "$@" if ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example) + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : + if ! modprobe nf_tables; then + modprobe ip_tables || : + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi fi uid="$(id -u)" From 8f1087c09b815115f53db74db38c12ae58c2b00b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 21 Dec 2023 10:04:29 -0800 Subject: [PATCH 255/667] Update 25-rc to 25.0.0-beta.3 --- 25-rc/cli/Dockerfile | 10 +++++----- 25-rc/dind-rootless/Dockerfile | 4 ++-- 25-rc/dind/Dockerfile | 8 ++++---- 25-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 67965baad..f0528e022 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 25.0.0-beta.2 +ENV DOCKER_VERSION 25.0.0-beta.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind-rootless/Dockerfile b/25-rc/dind-rootless/Dockerfile index 70a87b821..1e8944c8b 100644 --- a/25-rc/dind-rootless/Dockerfile +++ b/25-rc/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/test/x86_64/docker-rootless-extras-25.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-beta.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind/Dockerfile b/25-rc/dind/Dockerfile index 72f8279f5..15c774ff7 100644 --- a/25-rc/dind/Dockerfile +++ b/25-rc/dind/Dockerfile @@ -67,16 +67,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 4fd5fc865..187b05dd5 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/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 25.0.0-beta.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.2.zip +ENV DOCKER_VERSION 25.0.0-beta.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.3.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/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 0ab63b423..5cc2486d6 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/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 25.0.0-beta.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.2.zip +ENV DOCKER_VERSION 25.0.0-beta.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.3.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/versions.json b/versions.json index 63738ab0e..921568e8f 100644 --- a/versions.json +++ b/versions.json @@ -145,21 +145,21 @@ "25-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-beta.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-beta.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.2.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.3.zip" } }, "buildx": { @@ -281,6 +281,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "25.0.0-beta.2" + "version": "25.0.0-beta.3" } } From 3a0424834732f20142291cdd1d392e6d860af2ad Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 21 Dec 2023 13:29:46 -0800 Subject: [PATCH 256/667] (temporarily) Revert "Add a "docker" group (with GID 2375)" This reverts commit 9ebd7f6d5a3f26f47d627d0d7510f4b05fc9e977. --- 24/cli/Dockerfile | 4 ---- 25-rc/cli/Dockerfile | 4 ---- Dockerfile-cli.template | 4 ---- 3 files changed, 12 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 73a5ac15b..f385b9608 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -17,10 +17,6 @@ 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 -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - ENV DOCKER_VERSION 24.0.7 RUN set -eux; \ diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index f0528e022..3911b9993 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -17,10 +17,6 @@ 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 -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - ENV DOCKER_VERSION 25.0.0-beta.3 RUN set -eux; \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 83622f12b..05c75697b 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -12,10 +12,6 @@ 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 -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - ENV DOCKER_VERSION {{ .version }} RUN set -eux; \ From c40845fc737959146e92791751def871ab40119e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 21 Dec 2023 13:41:09 -0800 Subject: [PATCH 257/667] Revert "(temporarily) Revert "Add a "docker" group (with GID 2375)"" This reverts commit 3a0424834732f20142291cdd1d392e6d860af2ad (which reverted commit 9ebd7f6d5a3f26f47d627d0d7510f4b05fc9e977). --- 24/cli/Dockerfile | 4 ++++ 25-rc/cli/Dockerfile | 4 ++++ Dockerfile-cli.template | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index f385b9608..73a5ac15b 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -17,6 +17,10 @@ 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 +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + ENV DOCKER_VERSION 24.0.7 RUN set -eux; \ diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 3911b9993..f0528e022 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -17,6 +17,10 @@ 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 +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + ENV DOCKER_VERSION 25.0.0-beta.3 RUN set -eux; \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 05c75697b..83622f12b 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -12,6 +12,10 @@ 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 +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + ENV DOCKER_VERSION {{ .version }} RUN set -eux; \ From da22584bae1b6095cd615401b0d301c2d09deeb6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 18 Dec 2023 14:50:28 -0800 Subject: [PATCH 258/667] Ignore the exit code of `modprobe` always The nature of `modprobe` in this image is that it works via `ip` hacks, but the exit code will always be non-zero because we don't have `/lib/modules` from the host. The effect of this was that everyone was using `iptables-legacy` (whether it was warranted for them to be doing so or not). --- 24/dind/dockerd-entrypoint.sh | 10 +++++++--- 25-rc/dind/dockerd-entrypoint.sh | 10 +++++++--- dockerd-entrypoint.sh | 10 +++++++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/24/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh index c15a62417..9f892b053 100755 --- a/24/dind/dockerd-entrypoint.sh +++ b/24/dind/dockerd-entrypoint.sh @@ -148,10 +148,14 @@ if [ "$1" = 'dockerd' ]; then # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - if ! modprobe nf_tables; then + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) modprobe ip_tables || : - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi fi fi diff --git a/25-rc/dind/dockerd-entrypoint.sh b/25-rc/dind/dockerd-entrypoint.sh index c15a62417..9f892b053 100755 --- a/25-rc/dind/dockerd-entrypoint.sh +++ b/25-rc/dind/dockerd-entrypoint.sh @@ -148,10 +148,14 @@ if [ "$1" = 'dockerd' ]; then # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - if ! modprobe nf_tables; then + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) modprobe ip_tables || : - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi fi fi diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index c15a62417..9f892b053 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -148,10 +148,14 @@ if [ "$1" = 'dockerd' ]; then # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - if ! modprobe nf_tables; then + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) modprobe ip_tables || : - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi fi fi From d5d05eb749dad8d893b45d7e4a928e4dfe1f33f7 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 19 Dec 2023 10:25:51 -0800 Subject: [PATCH 259/667] Use `/proc/net/ip_tables_names` (and friends) to pre-detect whether we should use `iptables-legacy` --- 24/dind/dockerd-entrypoint.sh | 22 +++++++++++++++++++--- 25-rc/dind/dockerd-entrypoint.sh | 22 +++++++++++++++++++--- dockerd-entrypoint.sh | 22 +++++++++++++++++++--- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/24/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh index 9f892b053..799204023 100755 --- a/24/dind/dockerd-entrypoint.sh +++ b/24/dind/dockerd-entrypoint.sh @@ -143,7 +143,20 @@ if [ "$1" = 'dockerd' ]; then # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) set -- docker-init -- "$@" - if ! iptables -nL > /dev/null 2>&1; then + iptablesLegacy= + if ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 @@ -153,11 +166,14 @@ if [ "$1" = 'dockerd' ]; then # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) modprobe ip_tables || : if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + iptablesLegacy=1 fi fi fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi uid="$(id -u)" if [ "$uid" != '0' ]; then diff --git a/25-rc/dind/dockerd-entrypoint.sh b/25-rc/dind/dockerd-entrypoint.sh index 9f892b053..799204023 100755 --- a/25-rc/dind/dockerd-entrypoint.sh +++ b/25-rc/dind/dockerd-entrypoint.sh @@ -143,7 +143,20 @@ if [ "$1" = 'dockerd' ]; then # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) set -- docker-init -- "$@" - if ! iptables -nL > /dev/null 2>&1; then + iptablesLegacy= + if ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 @@ -153,11 +166,14 @@ if [ "$1" = 'dockerd' ]; then # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) modprobe ip_tables || : if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + iptablesLegacy=1 fi fi fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi uid="$(id -u)" if [ "$uid" != '0' ]; then diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 9f892b053..799204023 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -143,7 +143,20 @@ if [ "$1" = 'dockerd' ]; then # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) set -- docker-init -- "$@" - if ! iptables -nL > /dev/null 2>&1; then + iptablesLegacy= + if ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) # https://github.com/docker-library/docker/issues/350 # https://github.com/moby/moby/issues/26824 @@ -153,11 +166,14 @@ if [ "$1" = 'dockerd' ]; then # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) modprobe ip_tables || : if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + iptablesLegacy=1 fi fi fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi uid="$(id -u)" if [ "$uid" != '0' ]; then From eb4c40e45daf9218a21526d0ebd076b627d0b882 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 19 Dec 2023 11:29:15 -0800 Subject: [PATCH 260/667] Add `DOCKER_IPTABLES_LEGACY` for letting users explicitly pick `iptables-legacy` via `--env DOCKER_IPTABLES_LEGACY=1` --- 24/dind/dockerd-entrypoint.sh | 11 ++++++++++- 25-rc/dind/dockerd-entrypoint.sh | 11 ++++++++++- dockerd-entrypoint.sh | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/24/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh index 799204023..b11a1cffd 100755 --- a/24/dind/dockerd-entrypoint.sh +++ b/24/dind/dockerd-entrypoint.sh @@ -144,7 +144,15 @@ if [ "$1" = 'dockerd' ]; then set -- docker-init -- "$@" iptablesLegacy= - if ( + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + else + modprobe nf_tables || : + fi + elif ( # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do @@ -174,6 +182,7 @@ if [ "$1" = 'dockerd' ]; then # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) export PATH="/usr/local/sbin/.iptables-legacy:$PATH" fi + iptables --version # so users can see whether it's legacy or not uid="$(id -u)" if [ "$uid" != '0' ]; then diff --git a/25-rc/dind/dockerd-entrypoint.sh b/25-rc/dind/dockerd-entrypoint.sh index 799204023..b11a1cffd 100755 --- a/25-rc/dind/dockerd-entrypoint.sh +++ b/25-rc/dind/dockerd-entrypoint.sh @@ -144,7 +144,15 @@ if [ "$1" = 'dockerd' ]; then set -- docker-init -- "$@" iptablesLegacy= - if ( + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + else + modprobe nf_tables || : + fi + elif ( # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do @@ -174,6 +182,7 @@ if [ "$1" = 'dockerd' ]; then # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) export PATH="/usr/local/sbin/.iptables-legacy:$PATH" fi + iptables --version # so users can see whether it's legacy or not uid="$(id -u)" if [ "$uid" != '0' ]; then diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 799204023..b11a1cffd 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -144,7 +144,15 @@ if [ "$1" = 'dockerd' ]; then set -- docker-init -- "$@" iptablesLegacy= - if ( + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + else + modprobe nf_tables || : + fi + elif ( # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do @@ -174,6 +182,7 @@ if [ "$1" = 'dockerd' ]; then # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) export PATH="/usr/local/sbin/.iptables-legacy:$PATH" fi + iptables --version # so users can see whether it's legacy or not uid="$(id -u)" if [ "$uid" != '0' ]; then From 458a535b2ce98b44ebf9f742061f29fdae08cea0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 4 Jan 2024 15:39:43 -0800 Subject: [PATCH 261/667] Update 25-rc to 25.0.0-rc.1 --- 25-rc/cli/Dockerfile | 10 +++++----- 25-rc/dind-rootless/Dockerfile | 4 ++-- 25-rc/dind/Dockerfile | 8 ++++---- 25-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index f0528e022..9a3db2a02 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 25.0.0-beta.3 +ENV DOCKER_VERSION 25.0.0-rc.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind-rootless/Dockerfile b/25-rc/dind-rootless/Dockerfile index 1e8944c8b..11bd99ef0 100644 --- a/25-rc/dind-rootless/Dockerfile +++ b/25-rc/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/test/x86_64/docker-rootless-extras-25.0.0-beta.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind/Dockerfile b/25-rc/dind/Dockerfile index 15c774ff7..9a1d77625 100644 --- a/25-rc/dind/Dockerfile +++ b/25-rc/dind/Dockerfile @@ -67,16 +67,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 187b05dd5..e6b70de43 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/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 25.0.0-beta.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.3.zip +ENV DOCKER_VERSION 25.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.1.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/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 5cc2486d6..bb90e65fb 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/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 25.0.0-beta.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.3.zip +ENV DOCKER_VERSION 25.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.1.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/versions.json b/versions.json index 921568e8f..ddbf91a4c 100644 --- a/versions.json +++ b/versions.json @@ -145,21 +145,21 @@ "25-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-beta.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.3.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.1.zip" } }, "buildx": { @@ -281,6 +281,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "25.0.0-beta.3" + "version": "25.0.0-rc.1" } } From e8fb8d7eabaddcb9552a49332ebe482c90938cc3 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 8 Jan 2024 14:09:25 -0800 Subject: [PATCH 262/667] Switch to consuming JSON from GitHub for "latest commit" For some reason, `curl -L https://github.com/docker/docker/commits/master/hack/dind.atom` has recently changed from returning XML by default to returning JSON, which from https://docs.github.com/en/rest/activity/feeds?apiVersion=2022-11-28 seems like it's intentional, so this adds an explicit `Accept:` header (the only explicit JSON one that seems to work) and uses `jq` to determine the latest `hack/dind` commit instead of hacking up the XML via `grep`+`awk`. --- versions.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/versions.sh b/versions.sh index e1bf411a8..91b9c9b73 100755 --- a/versions.sh +++ b/versions.sh @@ -23,8 +23,10 @@ else fi versions=( "${versions[@]%/}" ) -dindLatest="$(curl -fsSL 'https://github.com/docker/docker/commits/master/hack/dind.atom' | grep -E 'id.*Commit')" -dindLatest="$(awk <<<"$dindLatest" -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')" +dindLatest="$( + curl -fsSL -H 'Accept: application/json' 'https://github.com/docker/docker/commits/master/hack/dind.atom' \ + | jq -r '.payload | first(.commitGroups[].commits[].oid)' +)" dockerVersions="$( git ls-remote --tags https://github.com/docker/docker.git \ From ef1774baa091b633b95665177e518f5e07531bc7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 11 Jan 2024 10:04:15 -0800 Subject: [PATCH 263/667] Update 24 to compose 2.24.0 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 73a5ac15b..8f800971c 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_VERSION 2.24.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64'; \ - sha256='a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-x86_64'; \ + sha256='43fb39c0bc24ac796123935032eddcfb57a7acd9216badeb10714c986ea1e090'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6'; \ - sha256='b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv6'; \ + sha256='cb407cfd396892cc0317ef48570492d7e59445a9f50e92181fdf637548801d55'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7'; \ - sha256='4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv7'; \ + sha256='936b474e24a51a51fd797bd18290da6abf72d62a614d8730a1fed3deae816ed5'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64'; \ - sha256='71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-aarch64'; \ + sha256='d23d03be5880a2f6555932c572ddbc87bd0e1c4c1985933b7488d948eb2494ca'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le'; \ - sha256='6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-ppc64le'; \ + sha256='f52678e23b143b26c2ee20af4ac105ed571bb2e8e39d59478e04bd2d81cbe27c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64'; \ - sha256='3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-riscv64'; \ + sha256='555a373414675ae21cafff8280346c94561457f4be254b5576b22f4b5e8f2ab2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x'; \ - sha256='2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-s390x'; \ + sha256='37871d879aa0a73f2ac59dab9805bee751d25208bbe72d7d2ab45956f2e1750a'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index d0323e670..dd5d81e84 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 +ENV DOCKER_COMPOSE_VERSION 2.24.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 25fafca4b..9e613decf 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 +ENV DOCKER_COMPOSE_VERSION 2.24.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ddbf91a4c..9f59fde47 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64" + "sha256": "43fb39c0bc24ac796123935032eddcfb57a7acd9216badeb10714c986ea1e090", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6" + "sha256": "cb407cfd396892cc0317ef48570492d7e59445a9f50e92181fdf637548801d55", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7" + "sha256": "936b474e24a51a51fd797bd18290da6abf72d62a614d8730a1fed3deae816ed5", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64" + "sha256": "d23d03be5880a2f6555932c572ddbc87bd0e1c4c1985933b7488d948eb2494ca", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "28f8f43ea4088562bba8a1977e0d4f3edeb7a45acb8e9c58be2b85325ce29450", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-x86_64" + "sha256": "701293bf1566ec66f05d945aee4f8aac70665fe463bebbb1df266280e4997b53", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7212d93f2ffdd95f8929cf89ab95fa551895ef17077065cabb00f6f85633888b", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-aarch64" + "sha256": "65fc104b2f90c067e8e083cf392177970b6342f85713b311521fec409e5859f3", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le" + "sha256": "f52678e23b143b26c2ee20af4ac105ed571bb2e8e39d59478e04bd2d81cbe27c", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64" + "sha256": "555a373414675ae21cafff8280346c94561457f4be254b5576b22f4b5e8f2ab2", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x" + "sha256": "37871d879aa0a73f2ac59dab9805bee751d25208bbe72d7d2ab45956f2e1750a", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe" + "sha256": "4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "5e8fc62743039f3aa2e277f5dd66b00dd2acf1a6a94e0a22d98ce8750f935607", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-aarch64.exe" + "sha256": "2641c38022983a259a8209e6e53c5d06b8b314bca05b0ff42079d70736acd696", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.23.3" + "version": "2.24.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 72a378e3a80d0b8c21a887a2c5991251278c148c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 11 Jan 2024 10:05:57 -0800 Subject: [PATCH 264/667] Update 25-rc to compose 2.24.0 --- 25-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 9a3db2a02..4b01b5501 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.23.3 +ENV DOCKER_COMPOSE_VERSION 2.24.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64'; \ - sha256='a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-x86_64'; \ + sha256='43fb39c0bc24ac796123935032eddcfb57a7acd9216badeb10714c986ea1e090'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6'; \ - sha256='b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv6'; \ + sha256='cb407cfd396892cc0317ef48570492d7e59445a9f50e92181fdf637548801d55'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7'; \ - sha256='4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv7'; \ + sha256='936b474e24a51a51fd797bd18290da6abf72d62a614d8730a1fed3deae816ed5'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64'; \ - sha256='71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-aarch64'; \ + sha256='d23d03be5880a2f6555932c572ddbc87bd0e1c4c1985933b7488d948eb2494ca'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le'; \ - sha256='6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-ppc64le'; \ + sha256='f52678e23b143b26c2ee20af4ac105ed571bb2e8e39d59478e04bd2d81cbe27c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64'; \ - sha256='3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-riscv64'; \ + sha256='555a373414675ae21cafff8280346c94561457f4be254b5576b22f4b5e8f2ab2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x'; \ - sha256='2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098'; \ + url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-s390x'; \ + sha256='37871d879aa0a73f2ac59dab9805bee751d25208bbe72d7d2ab45956f2e1750a'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index e6b70de43..72afc0265 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 +ENV DOCKER_COMPOSE_VERSION 2.24.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index bb90e65fb..ffd3b4fce 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.23.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05 +ENV DOCKER_COMPOSE_VERSION 2.24.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 9f59fde47..d9f3db33f 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "a836e807951db448f991f303cddcc9a4ec69f4a49d58bc7d536cb91c77c04c33", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-x86_64" + "sha256": "43fb39c0bc24ac796123935032eddcfb57a7acd9216badeb10714c986ea1e090", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "b712693945360155842b578beace00effa723b604bfe1ccd6421645523e15d86", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv6" + "sha256": "cb407cfd396892cc0317ef48570492d7e59445a9f50e92181fdf637548801d55", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4068bcbe1dd90034c8fe8d2c65b600ba793fc19bdb65db3c2dbf80b8a078de6c", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-armv7" + "sha256": "936b474e24a51a51fd797bd18290da6abf72d62a614d8730a1fed3deae816ed5", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "71f38f0923b8a9b80ad02c823ec3207d94677547aa5c618ca41b81d29fe6b9d9", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-aarch64" + "sha256": "d23d03be5880a2f6555932c572ddbc87bd0e1c4c1985933b7488d948eb2494ca", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "28f8f43ea4088562bba8a1977e0d4f3edeb7a45acb8e9c58be2b85325ce29450", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-x86_64" + "sha256": "701293bf1566ec66f05d945aee4f8aac70665fe463bebbb1df266280e4997b53", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7212d93f2ffdd95f8929cf89ab95fa551895ef17077065cabb00f6f85633888b", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-darwin-aarch64" + "sha256": "65fc104b2f90c067e8e083cf392177970b6342f85713b311521fec409e5859f3", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "6110b0d30baee103c98ca5503bea24acb9d52bd333a67d3bf3c57d383c585c62", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-ppc64le" + "sha256": "f52678e23b143b26c2ee20af4ac105ed571bb2e8e39d59478e04bd2d81cbe27c", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "3ac26e5f272deb1364c9b8760af44c4dbd87d6faa42fc53bfec95885cfa8ae77", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-riscv64" + "sha256": "555a373414675ae21cafff8280346c94561457f4be254b5576b22f4b5e8f2ab2", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2886dd4eddaea1eeb03537bdc596ec8947eb3ef7908c955284f8aad9170d3098", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-linux-s390x" + "sha256": "37871d879aa0a73f2ac59dab9805bee751d25208bbe72d7d2ab45956f2e1750a", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7d3f56cc84838ca54c5f0e9c8a3645dd96030482d838663c367d93bc6c38dc05", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-x86_64.exe" + "sha256": "4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "5e8fc62743039f3aa2e277f5dd66b00dd2acf1a6a94e0a22d98ce8750f935607", - "url": "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-windows-aarch64.exe" + "sha256": "2641c38022983a259a8209e6e53c5d06b8b314bca05b0ff42079d70736acd696", + "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.23.3" + "version": "2.24.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From e941e9db596b57b22657161adde52155e3f73d66 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 11 Jan 2024 22:04:15 -0800 Subject: [PATCH 265/667] Update 24 to buildx 0.12.1 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 8f800971c..d003b376e 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.12.0 +ENV DOCKER_BUILDX_VERSION 0.12.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-amd64'; \ - sha256='7c393b92c148a0ce26c76a2abc99960be1d1097f0471978d41dc51d0c1a4471e'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64'; \ + sha256='716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v6'; \ - sha256='62d9162f526c3bb7f67768a5b0d81a8b3ad0371406dfc1f0775e4f62dfca7fe1'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6'; \ + sha256='4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v7'; \ - sha256='d941d6a5b072de775222d31d9f8467b4c1b1f56e3b08d1b78f828a9244c16464'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7'; \ + sha256='fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm64'; \ - sha256='781caebb36551b035cb9dcfaf91088543d09c73c4a2549341e6417d86b8bbb50'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64'; \ + sha256='fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-ppc64le'; \ - sha256='ab5bda4532528d6b0801c877999fce9def10c6a37624673fd13c668fdcde16b7'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le'; \ + sha256='1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-riscv64'; \ - sha256='a2b846919c44128c6db9165ad24545e7e10035b6f0ad01559fcfbb2a13017127'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64'; \ + sha256='152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-s390x'; \ - sha256='81c2ada65624e2ac6bb4123f3a3bb933d04cfb08aa45fc55dd201ba523d96d30'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x'; \ + sha256='acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index dd5d81e84..f049cb916 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352 +ENV DOCKER_BUILDX_VERSION 0.12.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 9e613decf..6ff03830e 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352 +ENV DOCKER_BUILDX_VERSION 0.12.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index d9f3db33f..e1f91bd37 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.12.0.linux-amd64", - "sha256": "7c393b92c148a0ce26c76a2abc99960be1d1097f0471978d41dc51d0c1a4471e", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-amd64" + "file": "buildx-v0.12.1.linux-amd64", + "sha256": "716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.12.0.linux-arm-v6", - "sha256": "62d9162f526c3bb7f67768a5b0d81a8b3ad0371406dfc1f0775e4f62dfca7fe1", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v6" + "file": "buildx-v0.12.1.linux-arm-v6", + "sha256": "4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.12.0.linux-arm-v7", - "sha256": "d941d6a5b072de775222d31d9f8467b4c1b1f56e3b08d1b78f828a9244c16464", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v7" + "file": "buildx-v0.12.1.linux-arm-v7", + "sha256": "fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.12.0.linux-arm64", - "sha256": "781caebb36551b035cb9dcfaf91088543d09c73c4a2549341e6417d86b8bbb50", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm64" + "file": "buildx-v0.12.1.linux-arm64", + "sha256": "fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.12.0.linux-ppc64le", - "sha256": "ab5bda4532528d6b0801c877999fce9def10c6a37624673fd13c668fdcde16b7", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-ppc64le" + "file": "buildx-v0.12.1.linux-ppc64le", + "sha256": "1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.12.0.linux-riscv64", - "sha256": "a2b846919c44128c6db9165ad24545e7e10035b6f0ad01559fcfbb2a13017127", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-riscv64" + "file": "buildx-v0.12.1.linux-riscv64", + "sha256": "152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.12.0.linux-s390x", - "sha256": "81c2ada65624e2ac6bb4123f3a3bb933d04cfb08aa45fc55dd201ba523d96d30", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-s390x" + "file": "buildx-v0.12.1.linux-s390x", + "sha256": "acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.12.0.windows-amd64.exe", - "sha256": "dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe" + "file": "buildx-v0.12.1.windows-amd64.exe", + "sha256": "0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.12.0.windows-arm64.exe", - "sha256": "3ace30ecc39b214f80d92c7750c5fc51510ca0eee234aa015d89929c531a22d3", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-arm64.exe" + "file": "buildx-v0.12.1.windows-arm64.exe", + "sha256": "1eecfbd9a840b3bbd0b08fc83bb0a62bf40c67c4314cd0117117604b9b0255a1", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-arm64.exe" } }, - "version": "0.12.0" + "version": "0.12.1" }, "compose": { "arches": { From a4e8aab82b6efe03007029d4a843faff7a1cd16d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 11 Jan 2024 22:06:01 -0800 Subject: [PATCH 266/667] Update 25-rc to buildx 0.12.1 --- 25-rc/cli/Dockerfile | 30 +++++----- .../windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 4b01b5501..0cf862961 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.12.0 +ENV DOCKER_BUILDX_VERSION 0.12.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-amd64'; \ - sha256='7c393b92c148a0ce26c76a2abc99960be1d1097f0471978d41dc51d0c1a4471e'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64'; \ + sha256='716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v6'; \ - sha256='62d9162f526c3bb7f67768a5b0d81a8b3ad0371406dfc1f0775e4f62dfca7fe1'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6'; \ + sha256='4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v7'; \ - sha256='d941d6a5b072de775222d31d9f8467b4c1b1f56e3b08d1b78f828a9244c16464'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7'; \ + sha256='fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm64'; \ - sha256='781caebb36551b035cb9dcfaf91088543d09c73c4a2549341e6417d86b8bbb50'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64'; \ + sha256='fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-ppc64le'; \ - sha256='ab5bda4532528d6b0801c877999fce9def10c6a37624673fd13c668fdcde16b7'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le'; \ + sha256='1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-riscv64'; \ - sha256='a2b846919c44128c6db9165ad24545e7e10035b6f0ad01559fcfbb2a13017127'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64'; \ + sha256='152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-s390x'; \ - sha256='81c2ada65624e2ac6bb4123f3a3bb933d04cfb08aa45fc55dd201ba523d96d30'; \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x'; \ + sha256='acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 72afc0265..671951aba 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352 +ENV DOCKER_BUILDX_VERSION 0.12.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index ffd3b4fce..45388d459 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352 +ENV DOCKER_BUILDX_VERSION 0.12.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index e1f91bd37..d50617910 100644 --- a/versions.json +++ b/versions.json @@ -165,52 +165,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.12.0.linux-amd64", - "sha256": "7c393b92c148a0ce26c76a2abc99960be1d1097f0471978d41dc51d0c1a4471e", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-amd64" + "file": "buildx-v0.12.1.linux-amd64", + "sha256": "716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.12.0.linux-arm-v6", - "sha256": "62d9162f526c3bb7f67768a5b0d81a8b3ad0371406dfc1f0775e4f62dfca7fe1", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v6" + "file": "buildx-v0.12.1.linux-arm-v6", + "sha256": "4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.12.0.linux-arm-v7", - "sha256": "d941d6a5b072de775222d31d9f8467b4c1b1f56e3b08d1b78f828a9244c16464", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm-v7" + "file": "buildx-v0.12.1.linux-arm-v7", + "sha256": "fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.12.0.linux-arm64", - "sha256": "781caebb36551b035cb9dcfaf91088543d09c73c4a2549341e6417d86b8bbb50", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-arm64" + "file": "buildx-v0.12.1.linux-arm64", + "sha256": "fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.12.0.linux-ppc64le", - "sha256": "ab5bda4532528d6b0801c877999fce9def10c6a37624673fd13c668fdcde16b7", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-ppc64le" + "file": "buildx-v0.12.1.linux-ppc64le", + "sha256": "1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.12.0.linux-riscv64", - "sha256": "a2b846919c44128c6db9165ad24545e7e10035b6f0ad01559fcfbb2a13017127", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-riscv64" + "file": "buildx-v0.12.1.linux-riscv64", + "sha256": "152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.12.0.linux-s390x", - "sha256": "81c2ada65624e2ac6bb4123f3a3bb933d04cfb08aa45fc55dd201ba523d96d30", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.linux-s390x" + "file": "buildx-v0.12.1.linux-s390x", + "sha256": "acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.12.0.windows-amd64.exe", - "sha256": "dcf01329368381fae8c24b494186a30d2f1c4adb4bef7a0410b4803e5bb1c352", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-amd64.exe" + "file": "buildx-v0.12.1.windows-amd64.exe", + "sha256": "0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.12.0.windows-arm64.exe", - "sha256": "3ace30ecc39b214f80d92c7750c5fc51510ca0eee234aa015d89929c531a22d3", - "url": "https://github.com/docker/buildx/releases/download/v0.12.0/buildx-v0.12.0.windows-arm64.exe" + "file": "buildx-v0.12.1.windows-arm64.exe", + "sha256": "1eecfbd9a840b3bbd0b08fc83bb0a62bf40c67c4314cd0117117604b9b0255a1", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-arm64.exe" } }, - "version": "0.12.0" + "version": "0.12.1" }, "compose": { "arches": { From 5fcc1d9e9caf010a3cd8496f39b35dc9a72070e3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 12 Jan 2024 16:58:33 -0800 Subject: [PATCH 267/667] Update 25-rc to 25.0.0-rc.2 --- 25-rc/cli/Dockerfile | 10 +++++----- 25-rc/dind-rootless/Dockerfile | 4 ++-- 25-rc/dind/Dockerfile | 8 ++++---- 25-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 0cf862961..4f1fdb7ba 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 25.0.0-rc.1 +ENV DOCKER_VERSION 25.0.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind-rootless/Dockerfile b/25-rc/dind-rootless/Dockerfile index 11bd99ef0..2ed98b2cd 100644 --- a/25-rc/dind-rootless/Dockerfile +++ b/25-rc/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/test/x86_64/docker-rootless-extras-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind/Dockerfile b/25-rc/dind/Dockerfile index 9a1d77625..dcfacd199 100644 --- a/25-rc/dind/Dockerfile +++ b/25-rc/dind/Dockerfile @@ -67,16 +67,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 671951aba..9a245bfc5 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/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 25.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.1.zip +ENV DOCKER_VERSION 25.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.2.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/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 45388d459..7337b5ed5 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/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 25.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.1.zip +ENV DOCKER_VERSION 25.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.2.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/versions.json b/versions.json index d50617910..5fc26222e 100644 --- a/versions.json +++ b/versions.json @@ -145,21 +145,21 @@ "25-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.2.zip" } }, "buildx": { @@ -281,6 +281,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "25.0.0-rc.1" + "version": "25.0.0-rc.2" } } From 7605511a89811bb4772d7ad4a45466941fa0399e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Jan 2024 14:25:58 -0800 Subject: [PATCH 268/667] Update 25-rc to 25.0.0-rc.3 --- 25-rc/cli/Dockerfile | 10 +++++----- 25-rc/dind-rootless/Dockerfile | 4 ++-- 25-rc/dind/Dockerfile | 8 ++++---- 25-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 4f1fdb7ba..27ed12fa1 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 25.0.0-rc.2 +ENV DOCKER_VERSION 25.0.0-rc.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind-rootless/Dockerfile b/25-rc/dind-rootless/Dockerfile index 2ed98b2cd..3065d26c8 100644 --- a/25-rc/dind-rootless/Dockerfile +++ b/25-rc/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/test/x86_64/docker-rootless-extras-25.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind/Dockerfile b/25-rc/dind/Dockerfile index dcfacd199..27eb61c69 100644 --- a/25-rc/dind/Dockerfile +++ b/25-rc/dind/Dockerfile @@ -67,16 +67,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 9a245bfc5..84aeefd74 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/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 25.0.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.2.zip +ENV DOCKER_VERSION 25.0.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.3.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/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 7337b5ed5..ba5374d14 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/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 25.0.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.2.zip +ENV DOCKER_VERSION 25.0.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.3.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/versions.json b/versions.json index 5fc26222e..79231015d 100644 --- a/versions.json +++ b/versions.json @@ -145,21 +145,21 @@ "25-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.2.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.3.zip" } }, "buildx": { @@ -281,6 +281,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "25.0.0-rc.2" + "version": "25.0.0-rc.3" } } From d93dd83c9d27ac43516e68f26e0d8a7713b2bd64 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Jan 2024 04:04:37 -0800 Subject: [PATCH 269/667] Update 24 to compose 2.24.1 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index d003b376e..e75d69da6 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.0 +ENV DOCKER_COMPOSE_VERSION 2.24.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-x86_64'; \ - sha256='43fb39c0bc24ac796123935032eddcfb57a7acd9216badeb10714c986ea1e090'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64'; \ + sha256='d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv6'; \ - sha256='cb407cfd396892cc0317ef48570492d7e59445a9f50e92181fdf637548801d55'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6'; \ + sha256='4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv7'; \ - sha256='936b474e24a51a51fd797bd18290da6abf72d62a614d8730a1fed3deae816ed5'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7'; \ + sha256='2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-aarch64'; \ - sha256='d23d03be5880a2f6555932c572ddbc87bd0e1c4c1985933b7488d948eb2494ca'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64'; \ + sha256='9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-ppc64le'; \ - sha256='f52678e23b143b26c2ee20af4ac105ed571bb2e8e39d59478e04bd2d81cbe27c'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le'; \ + sha256='68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-riscv64'; \ - sha256='555a373414675ae21cafff8280346c94561457f4be254b5576b22f4b5e8f2ab2'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64'; \ + sha256='b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-s390x'; \ - sha256='37871d879aa0a73f2ac59dab9805bee751d25208bbe72d7d2ab45956f2e1750a'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x'; \ + sha256='6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index f049cb916..789bf889f 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0 +ENV DOCKER_COMPOSE_VERSION 2.24.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 6ff03830e..e42882f0e 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0 +ENV DOCKER_COMPOSE_VERSION 2.24.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 79231015d..ed9fa8ae3 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "43fb39c0bc24ac796123935032eddcfb57a7acd9216badeb10714c986ea1e090", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-x86_64" + "sha256": "d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "cb407cfd396892cc0317ef48570492d7e59445a9f50e92181fdf637548801d55", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv6" + "sha256": "4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "936b474e24a51a51fd797bd18290da6abf72d62a614d8730a1fed3deae816ed5", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv7" + "sha256": "2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d23d03be5880a2f6555932c572ddbc87bd0e1c4c1985933b7488d948eb2494ca", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-aarch64" + "sha256": "9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "701293bf1566ec66f05d945aee4f8aac70665fe463bebbb1df266280e4997b53", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-darwin-x86_64" + "sha256": "2e2747a09cea129664e44e43338b062d4ef4ef49403badb866c5ff055a56c5b3", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "65fc104b2f90c067e8e083cf392177970b6342f85713b311521fec409e5859f3", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-darwin-aarch64" + "sha256": "58c6590de4f4fd5f3c32a9155d4210673a139f4b4670f02f4e86e715b1b48ee4", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "f52678e23b143b26c2ee20af4ac105ed571bb2e8e39d59478e04bd2d81cbe27c", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-ppc64le" + "sha256": "68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "555a373414675ae21cafff8280346c94561457f4be254b5576b22f4b5e8f2ab2", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-riscv64" + "sha256": "b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "37871d879aa0a73f2ac59dab9805bee751d25208bbe72d7d2ab45956f2e1750a", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-s390x" + "sha256": "6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe" + "sha256": "6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2641c38022983a259a8209e6e53c5d06b8b314bca05b0ff42079d70736acd696", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-aarch64.exe" + "sha256": "5d9a05400bba162a39403f782805665aa7aa337a10186fe644b7650affaf7bea", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.0" + "version": "2.24.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From edd8fbc4110fa21ad8ac2b03443890a2f1df74fd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Jan 2024 04:12:51 -0800 Subject: [PATCH 270/667] Update 25-rc to compose 2.24.1 --- 25-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 27ed12fa1..289816fda 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.0 +ENV DOCKER_COMPOSE_VERSION 2.24.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-x86_64'; \ - sha256='43fb39c0bc24ac796123935032eddcfb57a7acd9216badeb10714c986ea1e090'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64'; \ + sha256='d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv6'; \ - sha256='cb407cfd396892cc0317ef48570492d7e59445a9f50e92181fdf637548801d55'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6'; \ + sha256='4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv7'; \ - sha256='936b474e24a51a51fd797bd18290da6abf72d62a614d8730a1fed3deae816ed5'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7'; \ + sha256='2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-aarch64'; \ - sha256='d23d03be5880a2f6555932c572ddbc87bd0e1c4c1985933b7488d948eb2494ca'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64'; \ + sha256='9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-ppc64le'; \ - sha256='f52678e23b143b26c2ee20af4ac105ed571bb2e8e39d59478e04bd2d81cbe27c'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le'; \ + sha256='68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-riscv64'; \ - sha256='555a373414675ae21cafff8280346c94561457f4be254b5576b22f4b5e8f2ab2'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64'; \ + sha256='b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-s390x'; \ - sha256='37871d879aa0a73f2ac59dab9805bee751d25208bbe72d7d2ab45956f2e1750a'; \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x'; \ + sha256='6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 84aeefd74..d4a83f360 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0 +ENV DOCKER_COMPOSE_VERSION 2.24.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index ba5374d14..8de2c02ec 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0 +ENV DOCKER_COMPOSE_VERSION 2.24.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ed9fa8ae3..5ef3f7888 100644 --- a/versions.json +++ b/versions.json @@ -216,61 +216,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "43fb39c0bc24ac796123935032eddcfb57a7acd9216badeb10714c986ea1e090", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-x86_64" + "sha256": "d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "cb407cfd396892cc0317ef48570492d7e59445a9f50e92181fdf637548801d55", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv6" + "sha256": "4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "936b474e24a51a51fd797bd18290da6abf72d62a614d8730a1fed3deae816ed5", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-armv7" + "sha256": "2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d23d03be5880a2f6555932c572ddbc87bd0e1c4c1985933b7488d948eb2494ca", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-aarch64" + "sha256": "9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "701293bf1566ec66f05d945aee4f8aac70665fe463bebbb1df266280e4997b53", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-darwin-x86_64" + "sha256": "2e2747a09cea129664e44e43338b062d4ef4ef49403badb866c5ff055a56c5b3", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "65fc104b2f90c067e8e083cf392177970b6342f85713b311521fec409e5859f3", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-darwin-aarch64" + "sha256": "58c6590de4f4fd5f3c32a9155d4210673a139f4b4670f02f4e86e715b1b48ee4", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "f52678e23b143b26c2ee20af4ac105ed571bb2e8e39d59478e04bd2d81cbe27c", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-ppc64le" + "sha256": "68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "555a373414675ae21cafff8280346c94561457f4be254b5576b22f4b5e8f2ab2", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-riscv64" + "sha256": "b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "37871d879aa0a73f2ac59dab9805bee751d25208bbe72d7d2ab45956f2e1750a", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-linux-s390x" + "sha256": "6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "4e0e387d67a65d92e3a7aca085f86b4b46ed5bd7a475f81921629e1d097178f0", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-x86_64.exe" + "sha256": "6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2641c38022983a259a8209e6e53c5d06b8b314bca05b0ff42079d70736acd696", - "url": "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-windows-aarch64.exe" + "sha256": "5d9a05400bba162a39403f782805665aa7aa337a10186fe644b7650affaf7bea", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.0" + "version": "2.24.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From d3e33ac3bc1eab5d436b7ab2981ba539ebbb7275 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 19 Jan 2024 04:04:26 -0800 Subject: [PATCH 271/667] Update 25 to 25.0.0, buildx 0.12.1, compose 2.24.1 --- 25/cli/Dockerfile | 165 +++++++++++++ 25/cli/docker-entrypoint.sh | 61 +++++ 25/cli/modprobe.sh | 20 ++ 25/dind-rootless/Dockerfile | 55 +++++ 25/dind/Dockerfile | 114 +++++++++ 25/dind/dockerd-entrypoint.sh | 232 ++++++++++++++++++ 25/git/Dockerfile | 9 + 25/windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ versions.json | 142 ++++++++++- 10 files changed, 979 insertions(+), 1 deletion(-) create mode 100644 25/cli/Dockerfile create mode 100755 25/cli/docker-entrypoint.sh create mode 100755 25/cli/modprobe.sh create mode 100644 25/dind-rootless/Dockerfile create mode 100644 25/dind/Dockerfile create mode 100755 25/dind/dockerd-entrypoint.sh create mode 100644 25/git/Dockerfile create mode 100644 25/windows/windowsservercore-1809/Dockerfile create mode 100644 25/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile new file mode 100644 index 000000000..df1c9cbd9 --- /dev/null +++ b/25/cli/Dockerfile @@ -0,0 +1,165 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.19 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 25.0.0 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.12.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64'; \ + sha256='716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6'; \ + sha256='4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7'; \ + sha256='fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64'; \ + sha256='fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le'; \ + sha256='1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64'; \ + sha256='152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x'; \ + sha256='acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.24.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64'; \ + sha256='d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6'; \ + sha256='4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7'; \ + sha256='2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64'; \ + sha256='9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le'; \ + sha256='68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64'; \ + sha256='b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x'; \ + sha256='6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/25/cli/docker-entrypoint.sh b/25/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/25/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/25/cli/modprobe.sh b/25/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/25/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/25/dind-rootless/Dockerfile b/25/dind-rootless/Dockerfile new file mode 100644 index 000000000..ffe84cd8d --- /dev/null +++ b/25/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:25-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +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-25.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/25/dind/Dockerfile b/25/dind/Dockerfile new file mode 100644 index 000000000..20cc764f3 --- /dev/null +++ b/25/dind/Dockerfile @@ -0,0 +1,114 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:25-cli + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + ip6tables \ + iptables \ + openssl \ + shadow-uidmap \ + xfsprogs \ + xz \ +# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) + pigz \ + ; \ +# only install zfs if it's available for the current architecture +# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) +# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch + if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ + apk add --no-cache zfs; \ + fi + +# TODO aufs-tools + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 + b="/sbin/${f/tables/tables-legacy}"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:25-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/25/dind/dockerd-entrypoint.sh b/25/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..b11a1cffd --- /dev/null +++ b/25/dind/dockerd-entrypoint.sh @@ -0,0 +1,232 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/25/git/Dockerfile b/25/git/Dockerfile new file mode 100644 index 000000000..028d09d12 --- /dev/null +++ b/25/git/Dockerfile @@ -0,0 +1,9 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:25-dind + +RUN apk add --no-cache git diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..8fd101db3 --- /dev/null +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 25.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.12.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.24.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..8155a2324 --- /dev/null +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 25.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.12.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.24.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 5ef3f7888..2b7664d5c 100644 --- a/versions.json +++ b/versions.json @@ -141,7 +141,147 @@ "version": "24.0.7" }, "24-rc": null, - "25": null, + "25": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.0.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.0.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.0.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.0.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.0.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.12.1.linux-amd64", + "sha256": "716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.12.1.linux-arm-v6", + "sha256": "4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.12.1.linux-arm-v7", + "sha256": "fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.12.1.linux-arm64", + "sha256": "fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.12.1.linux-ppc64le", + "sha256": "1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.12.1.linux-riscv64", + "sha256": "152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.12.1.linux-s390x", + "sha256": "acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.12.1.windows-amd64.exe", + "sha256": "0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.12.1.windows-arm64.exe", + "sha256": "1eecfbd9a840b3bbd0b08fc83bb0a62bf40c67c4314cd0117117604b9b0255a1", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-arm64.exe" + } + }, + "version": "0.12.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "2e2747a09cea129664e44e43338b062d4ef4ef49403badb866c5ff055a56c5b3", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "58c6590de4f4fd5f3c32a9155d4210673a139f4b4670f02f4e86e715b1b48ee4", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "5d9a05400bba162a39403f782805665aa7aa337a10186fe644b7650affaf7bea", + "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.24.1" + }, + "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", + "variants": [ + "cli", + "dind", + "dind-rootless", + "git", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "25.0.0" + }, "25-rc": { "arches": { "amd64": { From 273a2df601253b25e8e98dda8f6675346d7338b8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 19 Jan 2024 04:06:06 -0800 Subject: [PATCH 272/667] Update 25-rc --- 25-rc/cli/Dockerfile | 165 ------------- 25-rc/cli/docker-entrypoint.sh | 61 ----- 25-rc/cli/modprobe.sh | 20 -- 25-rc/dind-rootless/Dockerfile | 55 ----- 25-rc/dind/Dockerfile | 114 --------- 25-rc/dind/dockerd-entrypoint.sh | 232 ------------------ 25-rc/git/Dockerfile | 9 - .../windows/windowsservercore-1809/Dockerfile | 91 ------- .../windowsservercore-ltsc2022/Dockerfile | 91 ------- versions.json | 142 +---------- 10 files changed, 1 insertion(+), 979 deletions(-) delete mode 100644 25-rc/cli/Dockerfile delete mode 100755 25-rc/cli/docker-entrypoint.sh delete mode 100755 25-rc/cli/modprobe.sh delete mode 100644 25-rc/dind-rootless/Dockerfile delete mode 100644 25-rc/dind/Dockerfile delete mode 100755 25-rc/dind/dockerd-entrypoint.sh delete mode 100644 25-rc/git/Dockerfile delete mode 100644 25-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 25-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile deleted file mode 100644 index 289816fda..000000000 --- a/25-rc/cli/Dockerfile +++ /dev/null @@ -1,165 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.19 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 25.0.0-rc.3 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.3.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.3.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.12.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64'; \ - sha256='716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6'; \ - sha256='4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7'; \ - sha256='fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64'; \ - sha256='fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le'; \ - sha256='1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64'; \ - sha256='152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x'; \ - sha256='acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.24.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64'; \ - sha256='d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6'; \ - sha256='4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7'; \ - sha256='2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64'; \ - sha256='9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le'; \ - sha256='68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64'; \ - sha256='b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x'; \ - sha256='6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/25-rc/cli/docker-entrypoint.sh b/25-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/25-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/25-rc/cli/modprobe.sh b/25-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/25-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/25-rc/dind-rootless/Dockerfile b/25-rc/dind-rootless/Dockerfile deleted file mode 100644 index 3065d26c8..000000000 --- a/25-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:25-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/25-rc/dind/Dockerfile b/25-rc/dind/Dockerfile deleted file mode 100644 index 27eb61c69..000000000 --- a/25-rc/dind/Dockerfile +++ /dev/null @@ -1,114 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:25-rc-cli - -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - ip6tables \ - iptables \ - openssl \ - shadow-uidmap \ - xfsprogs \ - xz \ -# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) - pigz \ - ; \ -# only install zfs if it's available for the current architecture -# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) -# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch - if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ - apk add --no-cache zfs; \ - fi - -# TODO aufs-tools - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 - b="/sbin/${f/tables/tables-legacy}"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.3.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.3.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:25-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/25-rc/dind/dockerd-entrypoint.sh b/25-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index b11a1cffd..000000000 --- a/25-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,232 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/25-rc/git/Dockerfile b/25-rc/git/Dockerfile deleted file mode 100644 index a4ffbbed1..000000000 --- a/25-rc/git/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:25-rc-dind - -RUN apk add --no-cache git diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index d4a83f360..000000000 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 25.0.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.3.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 8de2c02ec..000000000 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 25.0.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.3.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 2b7664d5c..3b5c756c7 100644 --- a/versions.json +++ b/versions.json @@ -282,145 +282,5 @@ ], "version": "25.0.0" }, - "25-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.3.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.3.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.3.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.3.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.3.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.12.1.linux-amd64", - "sha256": "716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.12.1.linux-arm-v6", - "sha256": "4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.12.1.linux-arm-v7", - "sha256": "fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.12.1.linux-arm64", - "sha256": "fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64" - }, - "ppc64le": { - "file": "buildx-v0.12.1.linux-ppc64le", - "sha256": "1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.12.1.linux-riscv64", - "sha256": "152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.12.1.linux-s390x", - "sha256": "acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.12.1.windows-amd64.exe", - "sha256": "0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.12.1.windows-arm64.exe", - "sha256": "1eecfbd9a840b3bbd0b08fc83bb0a62bf40c67c4314cd0117117604b9b0255a1", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-arm64.exe" - } - }, - "version": "0.12.1" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "2e2747a09cea129664e44e43338b062d4ef4ef49403badb866c5ff055a56c5b3", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "58c6590de4f4fd5f3c32a9155d4210673a139f4b4670f02f4e86e715b1b48ee4", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "5d9a05400bba162a39403f782805665aa7aa337a10186fe644b7650affaf7bea", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.24.1" - }, - "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", - "variants": [ - "cli", - "dind", - "dind-rootless", - "git", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "25.0.0-rc.3" - } + "25-rc": null } From 928bc5d8411ab77082a420711042d8ba9806392c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 22 Jan 2024 10:04:14 -0800 Subject: [PATCH 273/667] Update 24 to compose 2.24.2 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index e75d69da6..da332df88 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.1 +ENV DOCKER_COMPOSE_VERSION 2.24.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64'; \ - sha256='d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-x86_64'; \ + sha256='067a12983b9333d01947329190af756b6d12afe7b4b51b3e1e29328b4afe3b9f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6'; \ - sha256='4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv6'; \ + sha256='582d734ef0c14335ee4691f3550d56b3e1c1c4d787ed6354830b3c222eee542e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7'; \ - sha256='2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv7'; \ + sha256='e83fa84dc73cc8d5a0fe2d1ad3ad61202050f033e6df9f3f4f7b3c2b59181006'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64'; \ - sha256='9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-aarch64'; \ + sha256='beafe762fedd06fe9885317c33f8b29b39c2354d6840a494a69b3c3a36919212'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le'; \ - sha256='68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-ppc64le'; \ + sha256='6be73d6597efc822eff3f9dd6abb56b72ada76f8a5f798b1df2dce5105f39257'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64'; \ - sha256='b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-riscv64'; \ + sha256='33a15fcef9d975aee4ed404779fae068264da6de8f2851ead85f9e1701302411'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x'; \ - sha256='6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-s390x'; \ + sha256='0b62a8d7aad7ce81220a4d77aa4b17e443b888248c1da22bc808db1fcbf1e9ac'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 789bf889f..89b70c2ca 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb +ENV DOCKER_COMPOSE_VERSION 2.24.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index e42882f0e..64d38ea20 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb +ENV DOCKER_COMPOSE_VERSION 2.24.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 3b5c756c7..31d01efb7 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64" + "sha256": "067a12983b9333d01947329190af756b6d12afe7b4b51b3e1e29328b4afe3b9f", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6" + "sha256": "582d734ef0c14335ee4691f3550d56b3e1c1c4d787ed6354830b3c222eee542e", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7" + "sha256": "e83fa84dc73cc8d5a0fe2d1ad3ad61202050f033e6df9f3f4f7b3c2b59181006", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64" + "sha256": "beafe762fedd06fe9885317c33f8b29b39c2354d6840a494a69b3c3a36919212", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "2e2747a09cea129664e44e43338b062d4ef4ef49403badb866c5ff055a56c5b3", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-x86_64" + "sha256": "e30a9d8dab391489944030be32ab144afd26cc466fbe5b285421c2015c2679c7", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "58c6590de4f4fd5f3c32a9155d4210673a139f4b4670f02f4e86e715b1b48ee4", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-aarch64" + "sha256": "55e5e7da1d6ef25bd42134b2725bc96003ce127e638e93425f4649e08835f4db", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le" + "sha256": "6be73d6597efc822eff3f9dd6abb56b72ada76f8a5f798b1df2dce5105f39257", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64" + "sha256": "33a15fcef9d975aee4ed404779fae068264da6de8f2851ead85f9e1701302411", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x" + "sha256": "0b62a8d7aad7ce81220a4d77aa4b17e443b888248c1da22bc808db1fcbf1e9ac", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe" + "sha256": "8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "5d9a05400bba162a39403f782805665aa7aa337a10186fe644b7650affaf7bea", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-aarch64.exe" + "sha256": "c8729d2f4f9b7e122f364a86b1e70c8134579bd613f3556d93d2a4f019ff1c50", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.1" + "version": "2.24.2" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 0eb94892bd344857b35b73fb22ec73a746cb54c6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 22 Jan 2024 10:05:57 -0800 Subject: [PATCH 274/667] Update 25 to compose 2.24.2 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index df1c9cbd9..7bf9dfe90 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.1 +ENV DOCKER_COMPOSE_VERSION 2.24.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64'; \ - sha256='d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-x86_64'; \ + sha256='067a12983b9333d01947329190af756b6d12afe7b4b51b3e1e29328b4afe3b9f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6'; \ - sha256='4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv6'; \ + sha256='582d734ef0c14335ee4691f3550d56b3e1c1c4d787ed6354830b3c222eee542e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7'; \ - sha256='2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv7'; \ + sha256='e83fa84dc73cc8d5a0fe2d1ad3ad61202050f033e6df9f3f4f7b3c2b59181006'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64'; \ - sha256='9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-aarch64'; \ + sha256='beafe762fedd06fe9885317c33f8b29b39c2354d6840a494a69b3c3a36919212'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le'; \ - sha256='68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-ppc64le'; \ + sha256='6be73d6597efc822eff3f9dd6abb56b72ada76f8a5f798b1df2dce5105f39257'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64'; \ - sha256='b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-riscv64'; \ + sha256='33a15fcef9d975aee4ed404779fae068264da6de8f2851ead85f9e1701302411'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x'; \ - sha256='6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665'; \ + url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-s390x'; \ + sha256='0b62a8d7aad7ce81220a4d77aa4b17e443b888248c1da22bc808db1fcbf1e9ac'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 8fd101db3..9a606120f 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb +ENV DOCKER_COMPOSE_VERSION 2.24.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 8155a2324..881034e48 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb +ENV DOCKER_COMPOSE_VERSION 2.24.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 31d01efb7..a140c8957 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "d350bbbd1c74c0a8542193bd41881afea534b141c6a9d9a27b2f217e51d5c48c", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-x86_64" + "sha256": "067a12983b9333d01947329190af756b6d12afe7b4b51b3e1e29328b4afe3b9f", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4a89b48f6a758793d4b40b1ade7bd9e7e2e177e29f05f74abb3fde08f246f0c8", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv6" + "sha256": "582d734ef0c14335ee4691f3550d56b3e1c1c4d787ed6354830b3c222eee542e", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "2b339b900447394b0cc985d9be30782361828b615ce743c36a9674d4435a2fb9", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-armv7" + "sha256": "e83fa84dc73cc8d5a0fe2d1ad3ad61202050f033e6df9f3f4f7b3c2b59181006", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "9b35494742cc54544cd3f67b162ebfb43435077f02556bfb5a7e1c543f0a2da7", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-aarch64" + "sha256": "beafe762fedd06fe9885317c33f8b29b39c2354d6840a494a69b3c3a36919212", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "2e2747a09cea129664e44e43338b062d4ef4ef49403badb866c5ff055a56c5b3", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-x86_64" + "sha256": "e30a9d8dab391489944030be32ab144afd26cc466fbe5b285421c2015c2679c7", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "58c6590de4f4fd5f3c32a9155d4210673a139f4b4670f02f4e86e715b1b48ee4", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-darwin-aarch64" + "sha256": "55e5e7da1d6ef25bd42134b2725bc96003ce127e638e93425f4649e08835f4db", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "68ce36587759f18a9daaf4a11af6db1ba9e4b7089a8062654de38f8b84506647", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-ppc64le" + "sha256": "6be73d6597efc822eff3f9dd6abb56b72ada76f8a5f798b1df2dce5105f39257", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "b28cbb99ba1ae9d7b1a4e5d6828a2c2a9b124db2d4f1d226aa71a1f2741aa056", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-riscv64" + "sha256": "33a15fcef9d975aee4ed404779fae068264da6de8f2851ead85f9e1701302411", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6177f40328d4004d37b7e422d102d765aeb03e24e202ca8b791a6c000be90665", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-linux-s390x" + "sha256": "0b62a8d7aad7ce81220a4d77aa4b17e443b888248c1da22bc808db1fcbf1e9ac", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "6c94193c282d5fba71563c617fe8ddf8dce9355fb1d0ae93609221c590d06fcb", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-x86_64.exe" + "sha256": "8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "5d9a05400bba162a39403f782805665aa7aa337a10186fe644b7650affaf7bea", - "url": "https://github.com/docker/compose/releases/download/v2.24.1/docker-compose-windows-aarch64.exe" + "sha256": "c8729d2f4f9b7e122f364a86b1e70c8134579bd613f3556d93d2a4f019ff1c50", + "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.1" + "version": "2.24.2" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From d470c3a52f360272daa549c03abc327a40337846 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Jan 2024 04:05:09 -0800 Subject: [PATCH 275/667] Update 25 to 25.0.1 --- 25/cli/Dockerfile | 10 +++++----- 25/dind-rootless/Dockerfile | 4 ++-- 25/dind/Dockerfile | 8 ++++---- 25/windows/windowsservercore-1809/Dockerfile | 4 ++-- 25/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 7bf9dfe90..cb7b93b8a 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 25.0.0 +ENV DOCKER_VERSION 25.0.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/dind-rootless/Dockerfile b/25/dind-rootless/Dockerfile index ffe84cd8d..69273926b 100644 --- a/25/dind-rootless/Dockerfile +++ b/25/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-25.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/dind/Dockerfile b/25/dind/Dockerfile index 20cc764f3..8ce406131 100644 --- a/25/dind/Dockerfile +++ b/25/dind/Dockerfile @@ -67,16 +67,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 9a606120f..0dcdd07c3 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/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 25.0.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.0.zip +ENV DOCKER_VERSION 25.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.1.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/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 881034e48..529b4a0ae 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/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 25.0.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.0.zip +ENV DOCKER_VERSION 25.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.1.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/versions.json b/versions.json index a140c8957..37a9ca207 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "25": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.1.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "25.0.0" + "version": "25.0.1" }, "25-rc": null } From 5c21a7d75ecbb6c6c41d60374b8026d6e64546fb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Jan 2024 10:04:13 -0800 Subject: [PATCH 276/667] Update 24 to compose 2.24.3 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index da332df88..4eec1117d 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.2 +ENV DOCKER_COMPOSE_VERSION 2.24.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-x86_64'; \ - sha256='067a12983b9333d01947329190af756b6d12afe7b4b51b3e1e29328b4afe3b9f'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-x86_64'; \ + sha256='49b3b71e4428585f75294a83702d259f442a8fcdb2351864c6dcaa3f7e29b3aa'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv6'; \ - sha256='582d734ef0c14335ee4691f3550d56b3e1c1c4d787ed6354830b3c222eee542e'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv6'; \ + sha256='20cf111b8f28dc0e5b390ef6685c5504fc243597737ca46dac27e19e3f34190d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv7'; \ - sha256='e83fa84dc73cc8d5a0fe2d1ad3ad61202050f033e6df9f3f4f7b3c2b59181006'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv7'; \ + sha256='d08bc3066c07effc6e7115197ce410d16c6c0974d5a746f0c6d02bc4c10b8348'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-aarch64'; \ - sha256='beafe762fedd06fe9885317c33f8b29b39c2354d6840a494a69b3c3a36919212'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-aarch64'; \ + sha256='c5a2bdf09db39c2aaf820ed9d6bab0ee9de187411ab37b869a7df20d3dbbceed'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-ppc64le'; \ - sha256='6be73d6597efc822eff3f9dd6abb56b72ada76f8a5f798b1df2dce5105f39257'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-ppc64le'; \ + sha256='e7e39ebbc2c42d17d5e6a2938f3ed9c5989380d569b84bbcc916000ec276527d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-riscv64'; \ - sha256='33a15fcef9d975aee4ed404779fae068264da6de8f2851ead85f9e1701302411'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-riscv64'; \ + sha256='5b9a52806b8363d170770548ca7baf25c1f96dca1da837265b2a42989c323e32'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-s390x'; \ - sha256='0b62a8d7aad7ce81220a4d77aa4b17e443b888248c1da22bc808db1fcbf1e9ac'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-s390x'; \ + sha256='258e548656bbce1a44459fcf579927b59a17b284e730d680843c19a699bf7739'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 89b70c2ca..d553ee30f 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0 +ENV DOCKER_COMPOSE_VERSION 2.24.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 64d38ea20..e242cd151 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0 +ENV DOCKER_COMPOSE_VERSION 2.24.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 37a9ca207..d7a5b5df8 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "067a12983b9333d01947329190af756b6d12afe7b4b51b3e1e29328b4afe3b9f", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-x86_64" + "sha256": "49b3b71e4428585f75294a83702d259f442a8fcdb2351864c6dcaa3f7e29b3aa", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "582d734ef0c14335ee4691f3550d56b3e1c1c4d787ed6354830b3c222eee542e", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv6" + "sha256": "20cf111b8f28dc0e5b390ef6685c5504fc243597737ca46dac27e19e3f34190d", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "e83fa84dc73cc8d5a0fe2d1ad3ad61202050f033e6df9f3f4f7b3c2b59181006", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv7" + "sha256": "d08bc3066c07effc6e7115197ce410d16c6c0974d5a746f0c6d02bc4c10b8348", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "beafe762fedd06fe9885317c33f8b29b39c2354d6840a494a69b3c3a36919212", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-aarch64" + "sha256": "c5a2bdf09db39c2aaf820ed9d6bab0ee9de187411ab37b869a7df20d3dbbceed", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "e30a9d8dab391489944030be32ab144afd26cc466fbe5b285421c2015c2679c7", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-darwin-x86_64" + "sha256": "6191307c1ac35fc1b79c4b6ded7c4f53f67c7eeeb600bb22fd86a926ea9c5ad3", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "55e5e7da1d6ef25bd42134b2725bc96003ce127e638e93425f4649e08835f4db", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-darwin-aarch64" + "sha256": "f732dd273c0e2efa383bd94e612d5ef6c5f63bc5c88e23080db15a634ddcecdd", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "6be73d6597efc822eff3f9dd6abb56b72ada76f8a5f798b1df2dce5105f39257", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-ppc64le" + "sha256": "e7e39ebbc2c42d17d5e6a2938f3ed9c5989380d569b84bbcc916000ec276527d", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "33a15fcef9d975aee4ed404779fae068264da6de8f2851ead85f9e1701302411", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-riscv64" + "sha256": "5b9a52806b8363d170770548ca7baf25c1f96dca1da837265b2a42989c323e32", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "0b62a8d7aad7ce81220a4d77aa4b17e443b888248c1da22bc808db1fcbf1e9ac", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-s390x" + "sha256": "258e548656bbce1a44459fcf579927b59a17b284e730d680843c19a699bf7739", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe" + "sha256": "107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "c8729d2f4f9b7e122f364a86b1e70c8134579bd613f3556d93d2a4f019ff1c50", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-aarch64.exe" + "sha256": "366fbbb5dc3b9cab42f69a38c0f5d68d034137133fa73b170754242d57a52cde", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.2" + "version": "2.24.3" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From a64ca2f07e32838fb1c7e0848952998fe6eab8a4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Jan 2024 10:05:49 -0800 Subject: [PATCH 277/667] Update 25 to compose 2.24.3 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index cb7b93b8a..911188794 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.2 +ENV DOCKER_COMPOSE_VERSION 2.24.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-x86_64'; \ - sha256='067a12983b9333d01947329190af756b6d12afe7b4b51b3e1e29328b4afe3b9f'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-x86_64'; \ + sha256='49b3b71e4428585f75294a83702d259f442a8fcdb2351864c6dcaa3f7e29b3aa'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv6'; \ - sha256='582d734ef0c14335ee4691f3550d56b3e1c1c4d787ed6354830b3c222eee542e'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv6'; \ + sha256='20cf111b8f28dc0e5b390ef6685c5504fc243597737ca46dac27e19e3f34190d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv7'; \ - sha256='e83fa84dc73cc8d5a0fe2d1ad3ad61202050f033e6df9f3f4f7b3c2b59181006'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv7'; \ + sha256='d08bc3066c07effc6e7115197ce410d16c6c0974d5a746f0c6d02bc4c10b8348'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-aarch64'; \ - sha256='beafe762fedd06fe9885317c33f8b29b39c2354d6840a494a69b3c3a36919212'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-aarch64'; \ + sha256='c5a2bdf09db39c2aaf820ed9d6bab0ee9de187411ab37b869a7df20d3dbbceed'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-ppc64le'; \ - sha256='6be73d6597efc822eff3f9dd6abb56b72ada76f8a5f798b1df2dce5105f39257'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-ppc64le'; \ + sha256='e7e39ebbc2c42d17d5e6a2938f3ed9c5989380d569b84bbcc916000ec276527d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-riscv64'; \ - sha256='33a15fcef9d975aee4ed404779fae068264da6de8f2851ead85f9e1701302411'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-riscv64'; \ + sha256='5b9a52806b8363d170770548ca7baf25c1f96dca1da837265b2a42989c323e32'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-s390x'; \ - sha256='0b62a8d7aad7ce81220a4d77aa4b17e443b888248c1da22bc808db1fcbf1e9ac'; \ + url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-s390x'; \ + sha256='258e548656bbce1a44459fcf579927b59a17b284e730d680843c19a699bf7739'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 0dcdd07c3..e832bc119 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0 +ENV DOCKER_COMPOSE_VERSION 2.24.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 529b4a0ae..7446394e5 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0 +ENV DOCKER_COMPOSE_VERSION 2.24.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index d7a5b5df8..b770a9822 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "067a12983b9333d01947329190af756b6d12afe7b4b51b3e1e29328b4afe3b9f", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-x86_64" + "sha256": "49b3b71e4428585f75294a83702d259f442a8fcdb2351864c6dcaa3f7e29b3aa", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "582d734ef0c14335ee4691f3550d56b3e1c1c4d787ed6354830b3c222eee542e", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv6" + "sha256": "20cf111b8f28dc0e5b390ef6685c5504fc243597737ca46dac27e19e3f34190d", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "e83fa84dc73cc8d5a0fe2d1ad3ad61202050f033e6df9f3f4f7b3c2b59181006", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-armv7" + "sha256": "d08bc3066c07effc6e7115197ce410d16c6c0974d5a746f0c6d02bc4c10b8348", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "beafe762fedd06fe9885317c33f8b29b39c2354d6840a494a69b3c3a36919212", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-aarch64" + "sha256": "c5a2bdf09db39c2aaf820ed9d6bab0ee9de187411ab37b869a7df20d3dbbceed", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "e30a9d8dab391489944030be32ab144afd26cc466fbe5b285421c2015c2679c7", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-darwin-x86_64" + "sha256": "6191307c1ac35fc1b79c4b6ded7c4f53f67c7eeeb600bb22fd86a926ea9c5ad3", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "55e5e7da1d6ef25bd42134b2725bc96003ce127e638e93425f4649e08835f4db", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-darwin-aarch64" + "sha256": "f732dd273c0e2efa383bd94e612d5ef6c5f63bc5c88e23080db15a634ddcecdd", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "6be73d6597efc822eff3f9dd6abb56b72ada76f8a5f798b1df2dce5105f39257", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-ppc64le" + "sha256": "e7e39ebbc2c42d17d5e6a2938f3ed9c5989380d569b84bbcc916000ec276527d", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "33a15fcef9d975aee4ed404779fae068264da6de8f2851ead85f9e1701302411", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-riscv64" + "sha256": "5b9a52806b8363d170770548ca7baf25c1f96dca1da837265b2a42989c323e32", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "0b62a8d7aad7ce81220a4d77aa4b17e443b888248c1da22bc808db1fcbf1e9ac", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-linux-s390x" + "sha256": "258e548656bbce1a44459fcf579927b59a17b284e730d680843c19a699bf7739", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "8402473653066beefdd602acb227f399cdae11a328ac3ca5feead826992c31b0", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-x86_64.exe" + "sha256": "107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "c8729d2f4f9b7e122f364a86b1e70c8134579bd613f3556d93d2a4f019ff1c50", - "url": "https://github.com/docker/compose/releases/download/v2.24.2/docker-compose-windows-aarch64.exe" + "sha256": "366fbbb5dc3b9cab42f69a38c0f5d68d034137133fa73b170754242d57a52cde", + "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.2" + "version": "2.24.3" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 1e52612a3093190411fbaed695e517dae1c6ff33 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Jan 2024 16:04:16 -0800 Subject: [PATCH 278/667] Update 24 to 24.0.8 --- 24/cli/Dockerfile | 10 +++++----- 24/dind-rootless/Dockerfile | 4 ++-- 24/dind/Dockerfile | 8 ++++---- 24/windows/windowsservercore-1809/Dockerfile | 4 ++-- 24/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 4eec1117d..864eddac3 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 24.0.7 +ENV DOCKER_VERSION 24.0.8 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.8.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.8.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.8.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.8.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind-rootless/Dockerfile b/24/dind-rootless/Dockerfile index eb973a8b1..0199ad47d 100644 --- a/24/dind-rootless/Dockerfile +++ b/24/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-24.0.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.8.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.8.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index 1cb755153..e082319b4 100644 --- a/24/dind/Dockerfile +++ b/24/dind/Dockerfile @@ -67,16 +67,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.8.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.8.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.8.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.7.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.8.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index d553ee30f..402b9852c 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/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 24.0.7 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.7.zip +ENV DOCKER_VERSION 24.0.8 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.8.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/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index e242cd151..ca44563cf 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/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 24.0.7 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.7.zip +ENV DOCKER_VERSION 24.0.8 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.8.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/versions.json b/versions.json index b770a9822..73d6672f3 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "24": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.7.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.7.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.8.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.8.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.7.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.8.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.7.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.8.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.7.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.7.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.8.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.8.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.7.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.8.zip" } }, "buildx": { @@ -138,7 +138,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.7" + "version": "24.0.8" }, "24-rc": null, "25": { From 569aff1d5298314dced1f4292433985d5807b43a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 29 Jan 2024 16:04:15 -0800 Subject: [PATCH 279/667] Update 24 to compose 2.24.4 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 864eddac3..b0402a0cf 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.3 +ENV DOCKER_COMPOSE_VERSION 2.24.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-x86_64'; \ - sha256='49b3b71e4428585f75294a83702d259f442a8fcdb2351864c6dcaa3f7e29b3aa'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64'; \ + sha256='b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv6'; \ - sha256='20cf111b8f28dc0e5b390ef6685c5504fc243597737ca46dac27e19e3f34190d'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6'; \ + sha256='4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv7'; \ - sha256='d08bc3066c07effc6e7115197ce410d16c6c0974d5a746f0c6d02bc4c10b8348'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7'; \ + sha256='122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-aarch64'; \ - sha256='c5a2bdf09db39c2aaf820ed9d6bab0ee9de187411ab37b869a7df20d3dbbceed'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64'; \ + sha256='cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-ppc64le'; \ - sha256='e7e39ebbc2c42d17d5e6a2938f3ed9c5989380d569b84bbcc916000ec276527d'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le'; \ + sha256='3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-riscv64'; \ - sha256='5b9a52806b8363d170770548ca7baf25c1f96dca1da837265b2a42989c323e32'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64'; \ + sha256='0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-s390x'; \ - sha256='258e548656bbce1a44459fcf579927b59a17b284e730d680843c19a699bf7739'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x'; \ + sha256='ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 402b9852c..6cfa1151c 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e +ENV DOCKER_COMPOSE_VERSION 2.24.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index ca44563cf..ff264be87 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e +ENV DOCKER_COMPOSE_VERSION 2.24.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 73d6672f3..f04af3a67 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "49b3b71e4428585f75294a83702d259f442a8fcdb2351864c6dcaa3f7e29b3aa", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-x86_64" + "sha256": "b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "20cf111b8f28dc0e5b390ef6685c5504fc243597737ca46dac27e19e3f34190d", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv6" + "sha256": "4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d08bc3066c07effc6e7115197ce410d16c6c0974d5a746f0c6d02bc4c10b8348", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv7" + "sha256": "122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "c5a2bdf09db39c2aaf820ed9d6bab0ee9de187411ab37b869a7df20d3dbbceed", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-aarch64" + "sha256": "cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "6191307c1ac35fc1b79c4b6ded7c4f53f67c7eeeb600bb22fd86a926ea9c5ad3", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-darwin-x86_64" + "sha256": "d57deb77ffab3c813b6c6d77041c1a66293c678e75230e44d626381751967cba", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "f732dd273c0e2efa383bd94e612d5ef6c5f63bc5c88e23080db15a634ddcecdd", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-darwin-aarch64" + "sha256": "e5d7dd8f0cccbbb729200cc1bf7fbf626cda79e36689ee8b4fd3d878cbbb09d9", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "e7e39ebbc2c42d17d5e6a2938f3ed9c5989380d569b84bbcc916000ec276527d", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-ppc64le" + "sha256": "3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "5b9a52806b8363d170770548ca7baf25c1f96dca1da837265b2a42989c323e32", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-riscv64" + "sha256": "0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "258e548656bbce1a44459fcf579927b59a17b284e730d680843c19a699bf7739", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-s390x" + "sha256": "ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe" + "sha256": "e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "366fbbb5dc3b9cab42f69a38c0f5d68d034137133fa73b170754242d57a52cde", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-aarch64.exe" + "sha256": "96e6d9845ad60c68a8e3c9a6f5de8cd4da44d63ad10b10c437bc36aaf7b28edf", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.3" + "version": "2.24.4" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From b4f1022d31509f76720dd0d89120a9518d827f65 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 29 Jan 2024 16:06:08 -0800 Subject: [PATCH 280/667] Update 25 to compose 2.24.4 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 911188794..a6a2eacd7 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.3 +ENV DOCKER_COMPOSE_VERSION 2.24.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-x86_64'; \ - sha256='49b3b71e4428585f75294a83702d259f442a8fcdb2351864c6dcaa3f7e29b3aa'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64'; \ + sha256='b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv6'; \ - sha256='20cf111b8f28dc0e5b390ef6685c5504fc243597737ca46dac27e19e3f34190d'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6'; \ + sha256='4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv7'; \ - sha256='d08bc3066c07effc6e7115197ce410d16c6c0974d5a746f0c6d02bc4c10b8348'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7'; \ + sha256='122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-aarch64'; \ - sha256='c5a2bdf09db39c2aaf820ed9d6bab0ee9de187411ab37b869a7df20d3dbbceed'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64'; \ + sha256='cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-ppc64le'; \ - sha256='e7e39ebbc2c42d17d5e6a2938f3ed9c5989380d569b84bbcc916000ec276527d'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le'; \ + sha256='3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-riscv64'; \ - sha256='5b9a52806b8363d170770548ca7baf25c1f96dca1da837265b2a42989c323e32'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64'; \ + sha256='0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-s390x'; \ - sha256='258e548656bbce1a44459fcf579927b59a17b284e730d680843c19a699bf7739'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x'; \ + sha256='ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index e832bc119..02e4595f3 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e +ENV DOCKER_COMPOSE_VERSION 2.24.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 7446394e5..cadd12987 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e +ENV DOCKER_COMPOSE_VERSION 2.24.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f04af3a67..c1d0669b0 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "49b3b71e4428585f75294a83702d259f442a8fcdb2351864c6dcaa3f7e29b3aa", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-x86_64" + "sha256": "b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "20cf111b8f28dc0e5b390ef6685c5504fc243597737ca46dac27e19e3f34190d", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv6" + "sha256": "4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d08bc3066c07effc6e7115197ce410d16c6c0974d5a746f0c6d02bc4c10b8348", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-armv7" + "sha256": "122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "c5a2bdf09db39c2aaf820ed9d6bab0ee9de187411ab37b869a7df20d3dbbceed", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-aarch64" + "sha256": "cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "6191307c1ac35fc1b79c4b6ded7c4f53f67c7eeeb600bb22fd86a926ea9c5ad3", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-darwin-x86_64" + "sha256": "d57deb77ffab3c813b6c6d77041c1a66293c678e75230e44d626381751967cba", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "f732dd273c0e2efa383bd94e612d5ef6c5f63bc5c88e23080db15a634ddcecdd", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-darwin-aarch64" + "sha256": "e5d7dd8f0cccbbb729200cc1bf7fbf626cda79e36689ee8b4fd3d878cbbb09d9", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "e7e39ebbc2c42d17d5e6a2938f3ed9c5989380d569b84bbcc916000ec276527d", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-ppc64le" + "sha256": "3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "5b9a52806b8363d170770548ca7baf25c1f96dca1da837265b2a42989c323e32", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-riscv64" + "sha256": "0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "258e548656bbce1a44459fcf579927b59a17b284e730d680843c19a699bf7739", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-linux-s390x" + "sha256": "ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "107586a56c0efb53cdd164f8de2c06d9737f4e142c80b6d7d9f5aa2be956425e", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-x86_64.exe" + "sha256": "e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "366fbbb5dc3b9cab42f69a38c0f5d68d034137133fa73b170754242d57a52cde", - "url": "https://github.com/docker/compose/releases/download/v2.24.3/docker-compose-windows-aarch64.exe" + "sha256": "96e6d9845ad60c68a8e3c9a6f5de8cd4da44d63ad10b10c437bc36aaf7b28edf", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.3" + "version": "2.24.4" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 604571204a2884b4db8e9df95266b92a63631976 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 30 Jan 2024 16:04:15 -0800 Subject: [PATCH 281/667] Update 24 to compose 2.24.5 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index b0402a0cf..4aaecac43 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.4 +ENV DOCKER_COMPOSE_VERSION 2.24.5 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64'; \ - sha256='b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64'; \ + sha256='94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6'; \ - sha256='4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6'; \ + sha256='bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7'; \ - sha256='122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7'; \ + sha256='80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64'; \ - sha256='cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64'; \ + sha256='535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le'; \ - sha256='3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le'; \ + sha256='2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64'; \ - sha256='0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64'; \ + sha256='e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x'; \ - sha256='ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x'; \ + sha256='7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 6cfa1151c..d1bace481 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb +ENV DOCKER_COMPOSE_VERSION 2.24.5 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index ff264be87..edf9299cc 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb +ENV DOCKER_COMPOSE_VERSION 2.24.5 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index c1d0669b0..d234ccf31 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64" + "sha256": "94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6" + "sha256": "bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7" + "sha256": "80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64" + "sha256": "535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "d57deb77ffab3c813b6c6d77041c1a66293c678e75230e44d626381751967cba", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-x86_64" + "sha256": "9fe711735f9337373fa7c81a7eb787f639d28a007350cc4849fc6dc6207a51cc", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "e5d7dd8f0cccbbb729200cc1bf7fbf626cda79e36689ee8b4fd3d878cbbb09d9", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-aarch64" + "sha256": "b179390c8f9d0efd052688a96ea87c37d401333a992c32988b947cd5bd9d837b", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le" + "sha256": "2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64" + "sha256": "e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x" + "sha256": "7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe" + "sha256": "eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "96e6d9845ad60c68a8e3c9a6f5de8cd4da44d63ad10b10c437bc36aaf7b28edf", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-aarch64.exe" + "sha256": "a59782dbc8d957e7774ef773446c4fef26cafff2bff2c2ed321a30d247d535bc", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.4" + "version": "2.24.5" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 88d007832055e045734f2c08f285721e12491d37 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 30 Jan 2024 16:06:00 -0800 Subject: [PATCH 282/667] Update 25 to compose 2.24.5 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index a6a2eacd7..7b8866add 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.4 +ENV DOCKER_COMPOSE_VERSION 2.24.5 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64'; \ - sha256='b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64'; \ + sha256='94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6'; \ - sha256='4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6'; \ + sha256='bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7'; \ - sha256='122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7'; \ + sha256='80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64'; \ - sha256='cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64'; \ + sha256='535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le'; \ - sha256='3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le'; \ + sha256='2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64'; \ - sha256='0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64'; \ + sha256='e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x'; \ - sha256='ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x'; \ + sha256='7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 02e4595f3..82fd8ad37 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb +ENV DOCKER_COMPOSE_VERSION 2.24.5 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index cadd12987..74e224ae8 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb +ENV DOCKER_COMPOSE_VERSION 2.24.5 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index d234ccf31..8fd39c25b 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64" + "sha256": "94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6" + "sha256": "bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7" + "sha256": "80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64" + "sha256": "535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "d57deb77ffab3c813b6c6d77041c1a66293c678e75230e44d626381751967cba", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-x86_64" + "sha256": "9fe711735f9337373fa7c81a7eb787f639d28a007350cc4849fc6dc6207a51cc", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "e5d7dd8f0cccbbb729200cc1bf7fbf626cda79e36689ee8b4fd3d878cbbb09d9", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-aarch64" + "sha256": "b179390c8f9d0efd052688a96ea87c37d401333a992c32988b947cd5bd9d837b", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le" + "sha256": "2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64" + "sha256": "e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x" + "sha256": "7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe" + "sha256": "eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "96e6d9845ad60c68a8e3c9a6f5de8cd4da44d63ad10b10c437bc36aaf7b28edf", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-aarch64.exe" + "sha256": "a59782dbc8d957e7774ef773446c4fef26cafff2bff2c2ed321a30d247d535bc", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.4" + "version": "2.24.5" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 7597a6c2cc745fe3aea57d8dc7d9dbbcc1dc10e8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 31 Jan 2024 22:04:26 -0800 Subject: [PATCH 283/667] Update 25 to 25.0.2 --- 25/cli/Dockerfile | 10 +++++----- 25/dind-rootless/Dockerfile | 4 ++-- 25/dind/Dockerfile | 8 ++++---- 25/windows/windowsservercore-1809/Dockerfile | 4 ++-- 25/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 7b8866add..cda9961f2 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 25.0.1 +ENV DOCKER_VERSION 25.0.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/dind-rootless/Dockerfile b/25/dind-rootless/Dockerfile index 69273926b..cdea3a486 100644 --- a/25/dind-rootless/Dockerfile +++ b/25/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-25.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/dind/Dockerfile b/25/dind/Dockerfile index 8ce406131..7374ef487 100644 --- a/25/dind/Dockerfile +++ b/25/dind/Dockerfile @@ -67,16 +67,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 82fd8ad37..5cf1328dd 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/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 25.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.1.zip +ENV DOCKER_VERSION 25.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.2.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/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 74e224ae8..c46d0e106 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/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 25.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.1.zip +ENV DOCKER_VERSION 25.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.2.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/versions.json b/versions.json index 8fd39c25b..300f169b0 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "25": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.2.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "25.0.1" + "version": "25.0.2" }, "25-rc": null } From faa16b36dd3257f8b020489d44fd7a339f11701d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 1 Feb 2024 08:06:26 -0800 Subject: [PATCH 284/667] Update 24 to 24.0.9 --- 24/cli/Dockerfile | 10 +++++----- 24/dind-rootless/Dockerfile | 4 ++-- 24/dind/Dockerfile | 8 ++++---- 24/windows/windowsservercore-1809/Dockerfile | 4 ++-- 24/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 4aaecac43..73c4547c3 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 24.0.8 +ENV DOCKER_VERSION 24.0.9 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.9.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.9.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.9.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.9.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind-rootless/Dockerfile b/24/dind-rootless/Dockerfile index 0199ad47d..e105f64e4 100644 --- a/24/dind-rootless/Dockerfile +++ b/24/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-24.0.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.9.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.9.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index e082319b4..f70855638 100644 --- a/24/dind/Dockerfile +++ b/24/dind/Dockerfile @@ -67,16 +67,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.9.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-24.0.9.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.9.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.8.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.9.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index d1bace481..f88a52ba6 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/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 24.0.8 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.8.zip +ENV DOCKER_VERSION 24.0.9 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.9.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/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index edf9299cc..e3e7f31c3 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/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 24.0.8 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.8.zip +ENV DOCKER_VERSION 24.0.9 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.9.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/versions.json b/versions.json index 300f169b0..ba2a20814 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "24": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.8.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.8.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.9.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.9.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.8.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.9.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.8.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.9.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.8.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.8.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.9.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.9.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.8.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.9.zip" } }, "buildx": { @@ -138,7 +138,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "24.0.8" + "version": "24.0.9" }, "24-rc": null, "25": { From 4d11263ddd18ffa44f9493e704189e505f227fba Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 3 Feb 2024 10:06:32 -0800 Subject: [PATCH 285/667] Update 24 to compose 2.24.4 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 73c4547c3..aba56d1f7 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.5 +ENV DOCKER_COMPOSE_VERSION 2.24.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64'; \ - sha256='94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64'; \ + sha256='b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6'; \ - sha256='bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6'; \ + sha256='4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7'; \ - sha256='80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7'; \ + sha256='122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64'; \ - sha256='535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64'; \ + sha256='cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le'; \ - sha256='2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le'; \ + sha256='3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64'; \ - sha256='e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64'; \ + sha256='0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x'; \ - sha256='7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1'; \ + url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x'; \ + sha256='ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index f88a52ba6..faeb1333b 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.5 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 +ENV DOCKER_COMPOSE_VERSION 2.24.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index e3e7f31c3..c59c7b558 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.5 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 +ENV DOCKER_COMPOSE_VERSION 2.24.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ba2a20814..b8d0fafdf 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64" + "sha256": "b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6" + "sha256": "4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7" + "sha256": "122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64" + "sha256": "cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9fe711735f9337373fa7c81a7eb787f639d28a007350cc4849fc6dc6207a51cc", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-x86_64" + "sha256": "d57deb77ffab3c813b6c6d77041c1a66293c678e75230e44d626381751967cba", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "b179390c8f9d0efd052688a96ea87c37d401333a992c32988b947cd5bd9d837b", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-aarch64" + "sha256": "e5d7dd8f0cccbbb729200cc1bf7fbf626cda79e36689ee8b4fd3d878cbbb09d9", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le" + "sha256": "3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64" + "sha256": "0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x" + "sha256": "ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe" + "sha256": "e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "a59782dbc8d957e7774ef773446c4fef26cafff2bff2c2ed321a30d247d535bc", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-aarch64.exe" + "sha256": "96e6d9845ad60c68a8e3c9a6f5de8cd4da44d63ad10b10c437bc36aaf7b28edf", + "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.5" + "version": "2.24.4" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 9a2c4c456c283e41fdac33e2371b730f7515e75e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 3 Feb 2024 16:04:14 -0800 Subject: [PATCH 286/667] Update 24 to compose 2.24.5 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index aba56d1f7..73c4547c3 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.4 +ENV DOCKER_COMPOSE_VERSION 2.24.5 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64'; \ - sha256='b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64'; \ + sha256='94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6'; \ - sha256='4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6'; \ + sha256='bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7'; \ - sha256='122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7'; \ + sha256='80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64'; \ - sha256='cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64'; \ + sha256='535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le'; \ - sha256='3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le'; \ + sha256='2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64'; \ - sha256='0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64'; \ + sha256='e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x'; \ - sha256='ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5'; \ + url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x'; \ + sha256='7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index faeb1333b..f88a52ba6 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb +ENV DOCKER_COMPOSE_VERSION 2.24.5 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index c59c7b558..e3e7f31c3 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb +ENV DOCKER_COMPOSE_VERSION 2.24.5 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b8d0fafdf..ba2a20814 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "b506272a7f34ea056e36ba23e83593c491fd8419b0ed30ecacc42fe2eee8c964", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-x86_64" + "sha256": "94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4b7ca7873d92c33603075ed9dec53a4b7573964eb09e86a3a3e4ded6f88cae1d", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv6" + "sha256": "bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "122d3220a3a7fe4d9a02fd9cbe6c342d0edc8494b4531787f3da6f85a5f85983", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-armv7" + "sha256": "80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "cf59a08baa32a5c8684550b836fb773e7a61a5a355a4a155d848805912244278", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-aarch64" + "sha256": "535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "d57deb77ffab3c813b6c6d77041c1a66293c678e75230e44d626381751967cba", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-x86_64" + "sha256": "9fe711735f9337373fa7c81a7eb787f639d28a007350cc4849fc6dc6207a51cc", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "e5d7dd8f0cccbbb729200cc1bf7fbf626cda79e36689ee8b4fd3d878cbbb09d9", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-darwin-aarch64" + "sha256": "b179390c8f9d0efd052688a96ea87c37d401333a992c32988b947cd5bd9d837b", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "3f16bb37487d154b2c4cff1969f7333dfc905bbd1466fcc8f10312dd3fc3f546", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-ppc64le" + "sha256": "2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "0f115f2c8a356e931524f0e182e11b0a32cd7f9af19ffecf96b59bba179d225f", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-riscv64" + "sha256": "e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "ced7587be61c6c18790d4bdeab9cbace6493523ce4196417ef69d326058d3ac5", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-linux-s390x" + "sha256": "7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e68c6eb31cc0aff2d9eb0f11d48e709888f25c0c204ce74bfbe69e33af3bbcbb", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-x86_64.exe" + "sha256": "eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "96e6d9845ad60c68a8e3c9a6f5de8cd4da44d63ad10b10c437bc36aaf7b28edf", - "url": "https://github.com/docker/compose/releases/download/v2.24.4/docker-compose-windows-aarch64.exe" + "sha256": "a59782dbc8d957e7774ef773446c4fef26cafff2bff2c2ed321a30d247d535bc", + "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.4" + "version": "2.24.5" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From de55ce1ae86abd97836f99759ae8badc30d0e0e6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 6 Feb 2024 16:56:51 -0800 Subject: [PATCH 287/667] Update 25 to 25.0.3 --- 25/cli/Dockerfile | 10 +++++----- 25/dind-rootless/Dockerfile | 4 ++-- 25/dind/Dockerfile | 8 ++++---- 25/windows/windowsservercore-1809/Dockerfile | 4 ++-- 25/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index cda9961f2..8639bc469 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 25.0.2 +ENV DOCKER_VERSION 25.0.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/dind-rootless/Dockerfile b/25/dind-rootless/Dockerfile index cdea3a486..3a400839c 100644 --- a/25/dind-rootless/Dockerfile +++ b/25/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-25.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/dind/Dockerfile b/25/dind/Dockerfile index 7374ef487..d1fce4657 100644 --- a/25/dind/Dockerfile +++ b/25/dind/Dockerfile @@ -67,16 +67,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 5cf1328dd..6305a850d 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/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 25.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.2.zip +ENV DOCKER_VERSION 25.0.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.3.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/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index c46d0e106..2b9f09ff0 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/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 25.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.2.zip +ENV DOCKER_VERSION 25.0.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.3.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/versions.json b/versions.json index ba2a20814..a96e062cf 100644 --- a/versions.json +++ b/versions.json @@ -144,21 +144,21 @@ "25": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.3.zip" } }, "buildx": { @@ -280,7 +280,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "25.0.2" + "version": "25.0.3" }, "25-rc": null } From 490fbdcc7ca1b6a303e7c888714a1c51610d1a2f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 15 Feb 2024 10:04:16 -0800 Subject: [PATCH 288/667] Update 24 to compose 2.24.6 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 73c4547c3..106d3b84c 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.5 +ENV DOCKER_COMPOSE_VERSION 2.24.6 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64'; \ - sha256='94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64'; \ + sha256='eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6'; \ - sha256='bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6'; \ + sha256='9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7'; \ - sha256='80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7'; \ + sha256='14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64'; \ - sha256='535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64'; \ + sha256='05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le'; \ - sha256='2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le'; \ + sha256='beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64'; \ - sha256='e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64'; \ + sha256='92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x'; \ - sha256='7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x'; \ + sha256='1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index f88a52ba6..a2cc4a854 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.5 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 +ENV DOCKER_COMPOSE_VERSION 2.24.6 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index e3e7f31c3..f2c49b2ee 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.5 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 +ENV DOCKER_COMPOSE_VERSION 2.24.6 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index a96e062cf..a6ea2cee7 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64" + "sha256": "eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6" + "sha256": "9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7" + "sha256": "14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64" + "sha256": "05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9fe711735f9337373fa7c81a7eb787f639d28a007350cc4849fc6dc6207a51cc", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-x86_64" + "sha256": "3eb451e8480cee3deb7f5c932d3da83e14cac543394136bf5da24fc9ad21b484", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "b179390c8f9d0efd052688a96ea87c37d401333a992c32988b947cd5bd9d837b", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-aarch64" + "sha256": "e270dea5d48958c7e477dc1713fd1d4c5409e38afba65bb5f092323c1d38df5f", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le" + "sha256": "beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64" + "sha256": "92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x" + "sha256": "1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe" + "sha256": "7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "a59782dbc8d957e7774ef773446c4fef26cafff2bff2c2ed321a30d247d535bc", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-aarch64.exe" + "sha256": "535bde4683f6a0d8d877850d67a436db2452902e9913a599c78dd274bae0ba06", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.5" + "version": "2.24.6" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From c0a2a6d85dab907b5a9349f7a25eb7eadbbfa4ea Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 15 Feb 2024 10:06:03 -0800 Subject: [PATCH 289/667] Update 25 to compose 2.24.6 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 8639bc469..cb17c4456 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.5 +ENV DOCKER_COMPOSE_VERSION 2.24.6 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64'; \ - sha256='94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64'; \ + sha256='eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6'; \ - sha256='bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6'; \ + sha256='9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7'; \ - sha256='80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7'; \ + sha256='14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64'; \ - sha256='535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64'; \ + sha256='05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le'; \ - sha256='2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le'; \ + sha256='beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64'; \ - sha256='e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64'; \ + sha256='92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x'; \ - sha256='7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1'; \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x'; \ + sha256='1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 6305a850d..27f3e2bdb 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.5 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 +ENV DOCKER_COMPOSE_VERSION 2.24.6 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 2b9f09ff0..91a0a7743 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.5 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9 +ENV DOCKER_COMPOSE_VERSION 2.24.6 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index a6ea2cee7..a595500c4 100644 --- a/versions.json +++ b/versions.json @@ -215,61 +215,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "94355be1d1d395040bbda1490f98d5c7627c30798a7955e1f2a78fda33a4b3e1", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-x86_64" + "sha256": "eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "bd402cf44fec9640c29e85184ddd36c9d4094045b296e2833533d53715d0cfc2", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv6" + "sha256": "9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "80248b4c2c407b22b24896ff6d6e766be7ca97239c5b8137f47c81b62a1befb4", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-armv7" + "sha256": "14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "535e90ff9a7f24384f8a38f9f9ad49125485af7ae5ffda7226d091e5b8126948", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-aarch64" + "sha256": "05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9fe711735f9337373fa7c81a7eb787f639d28a007350cc4849fc6dc6207a51cc", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-x86_64" + "sha256": "3eb451e8480cee3deb7f5c932d3da83e14cac543394136bf5da24fc9ad21b484", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "b179390c8f9d0efd052688a96ea87c37d401333a992c32988b947cd5bd9d837b", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-darwin-aarch64" + "sha256": "e270dea5d48958c7e477dc1713fd1d4c5409e38afba65bb5f092323c1d38df5f", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "2143fd5df30c29e22869e5461afac0ca1f2b8d435c544b89fc1d826eb9e52df8", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-ppc64le" + "sha256": "beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e4534c48b1bdf68d664ccc426800b215d3708f3a492d57e36b0a412f4d229546", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-riscv64" + "sha256": "92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "7def69d38989d1020c49ab37bb68ab2c29558484e33fc952b5258c84cb1bbda1", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-linux-s390x" + "sha256": "1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "eb60363d21a5c85eff2d2e18a4ed94d84d5016be59471d77d520046fdd888aa9", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-x86_64.exe" + "sha256": "7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "a59782dbc8d957e7774ef773446c4fef26cafff2bff2c2ed321a30d247d535bc", - "url": "https://github.com/docker/compose/releases/download/v2.24.5/docker-compose-windows-aarch64.exe" + "sha256": "535bde4683f6a0d8d877850d67a436db2452902e9913a599c78dd274bae0ba06", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.5" + "version": "2.24.6" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 485fefe743baed5a2dd9e5d22b685c14eda4c61e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 23 Feb 2024 11:50:50 -0800 Subject: [PATCH 290/667] Add `git` to `dind` variants (and make `git` an alias of `dind`, for 24.x and 25.x) This also does some minor cleanup of our installation of other dependencies. --- 24/dind/Dockerfile | 18 ++++++------------ 24/git/Dockerfile | 9 --------- 25/dind/Dockerfile | 18 ++++++------------ 25/git/Dockerfile | 9 --------- Dockerfile-dind.template | 18 ++++++------------ Dockerfile-git.template | 3 --- generate-stackbrew-library.sh | 10 ++++++++-- versions.json | 2 -- versions.sh | 1 - 9 files changed, 26 insertions(+), 62 deletions(-) delete mode 100644 24/git/Dockerfile delete mode 100644 25/git/Dockerfile delete mode 100644 Dockerfile-git.template diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile index f70855638..ab0aa3da9 100644 --- a/24/dind/Dockerfile +++ b/24/dind/Dockerfile @@ -6,29 +6,23 @@ FROM docker:24-cli -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 RUN set -eux; \ apk add --no-cache \ btrfs-progs \ e2fsprogs \ e2fsprogs-extra \ + git \ ip6tables \ iptables \ openssl \ + pigz \ shadow-uidmap \ xfsprogs \ xz \ -# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) - pigz \ - ; \ -# only install zfs if it's available for the current architecture -# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) -# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch - if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ - apk add --no-cache zfs; \ - fi - -# TODO aufs-tools + zfs \ + ; # dind might be used on systems where the nf_tables kernel module isn't available. In that case, # we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 diff --git a/24/git/Dockerfile b/24/git/Dockerfile deleted file mode 100644 index 0d649823f..000000000 --- a/24/git/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:24-dind - -RUN apk add --no-cache git diff --git a/25/dind/Dockerfile b/25/dind/Dockerfile index d1fce4657..88837ded0 100644 --- a/25/dind/Dockerfile +++ b/25/dind/Dockerfile @@ -6,29 +6,23 @@ FROM docker:25-cli -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 RUN set -eux; \ apk add --no-cache \ btrfs-progs \ e2fsprogs \ e2fsprogs-extra \ + git \ ip6tables \ iptables \ openssl \ + pigz \ shadow-uidmap \ xfsprogs \ xz \ -# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) - pigz \ - ; \ -# only install zfs if it's available for the current architecture -# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) -# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch - if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ - apk add --no-cache zfs; \ - fi - -# TODO aufs-tools + zfs \ + ; # dind might be used on systems where the nf_tables kernel module isn't available. In that case, # we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 diff --git a/25/git/Dockerfile b/25/git/Dockerfile deleted file mode 100644 index 028d09d12..000000000 --- a/25/git/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:25-dind - -RUN apk add --no-cache git diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 881ea6333..a70743631 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -1,29 +1,23 @@ {{ include "shared" -}} FROM docker:{{ env.version }}-cli -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 RUN set -eux; \ apk add --no-cache \ btrfs-progs \ e2fsprogs \ e2fsprogs-extra \ + git \ ip6tables \ iptables \ openssl \ + pigz \ shadow-uidmap \ xfsprogs \ xz \ -# pigz: https://github.com/moby/moby/pull/35697 (faster gzip implementation) - pigz \ - ; \ -# only install zfs if it's available for the current architecture -# https://git.alpinelinux.org/cgit/aports/tree/main/zfs/APKBUILD?h=3.6-stable#n9 ("all !armhf !ppc64le" as of 2017-11-01) -# "apk info XYZ" exits with a zero exit code but no output when the package exists but not for this arch - if zfs="$(apk info --no-cache --quiet zfs)" && [ -n "$zfs" ]; then \ - apk add --no-cache zfs; \ - fi - -# TODO aufs-tools + zfs \ + ; # dind might be used on systems where the nf_tables kernel module isn't available. In that case, # we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 diff --git a/Dockerfile-git.template b/Dockerfile-git.template deleted file mode 100644 index 3bab99c4c..000000000 --- a/Dockerfile-git.template +++ /dev/null @@ -1,3 +0,0 @@ -FROM docker:{{ env.version }}-dind - -RUN apk add --no-cache git diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d5304112e..bbc69c838 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -77,9 +77,9 @@ versionArches() { comm -12 \ <( - version="$version" jq -r ' + version="$version" jq -r --arg selector "$selector" ' .[env.version].arches | to_entries[] - | select(.value.'"$selector"') + | select(.value[$selector]) | .key ' versions.json | sort ) \ @@ -175,6 +175,12 @@ for version; do suiteAliases=( "${suiteAliases[@]//latest-/}" ) variantAliases+=( "${suiteAliases[@]}" ) if [ "$variant" = 'dind' ]; then + # add "git" aliases https://github.com/docker-library/docker/issues/482#issuecomment-1955609423 + if [ "$version" = '24' ] || [ "$version" = '25' ]; then + gitAliases=( "${versionAliases[@]/%/-git}" ) + gitAliases=( "${gitAliases[@]//latest-/}" ) + variantAliases+=( "${gitAliases[@]}" ) + fi # add "latest" aliases suiteAliases=( "${versionAliases[0]}" ) # only "X.Y.Z-foo" suiteAliases=( "${suiteAliases[@]/%/-alpine$alpine}" ) diff --git a/versions.json b/versions.json index a595500c4..60e9108ac 100644 --- a/versions.json +++ b/versions.json @@ -134,7 +134,6 @@ "cli", "dind", "dind-rootless", - "git", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], @@ -276,7 +275,6 @@ "cli", "dind", "dind-rootless", - "git", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], diff --git a/versions.sh b/versions.sh index 91b9c9b73..65999acb3 100755 --- a/versions.sh +++ b/versions.sh @@ -267,7 +267,6 @@ for version in "${versions[@]}"; do cli \ dind \ dind-rootless \ - git \ windows/windowsservercore-ltsc2022 \ windows/windowsservercore-1809 \ ; do From cc424ac96c2c90487f0c6b4cf044fada91dcc6a2 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 29 Feb 2024 12:10:50 +0100 Subject: [PATCH 291/667] Add v26.0.0-rc1 pre-release --- 26-rc/cli/Dockerfile | 165 +++++++++++++ 26-rc/cli/docker-entrypoint.sh | 61 +++++ 26-rc/cli/modprobe.sh | 20 ++ 26-rc/dind-rootless/Dockerfile | 55 +++++ 26-rc/dind/Dockerfile | 108 ++++++++ 26-rc/dind/dockerd-entrypoint.sh | 232 ++++++++++++++++++ .../windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ versions.json | 143 ++++++++++- 9 files changed, 965 insertions(+), 1 deletion(-) create mode 100644 26-rc/cli/Dockerfile create mode 100755 26-rc/cli/docker-entrypoint.sh create mode 100755 26-rc/cli/modprobe.sh create mode 100644 26-rc/dind-rootless/Dockerfile create mode 100644 26-rc/dind/Dockerfile create mode 100755 26-rc/dind/dockerd-entrypoint.sh create mode 100644 26-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 26-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/26-rc/cli/Dockerfile b/26-rc/cli/Dockerfile new file mode 100644 index 000000000..83f29d5db --- /dev/null +++ b/26-rc/cli/Dockerfile @@ -0,0 +1,165 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.19 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 26.0.0-rc1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.12.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64'; \ + sha256='716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6'; \ + sha256='4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7'; \ + sha256='fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64'; \ + sha256='fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le'; \ + sha256='1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64'; \ + sha256='152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x'; \ + sha256='acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.24.6 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64'; \ + sha256='eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6'; \ + sha256='9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7'; \ + sha256='14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64'; \ + sha256='05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le'; \ + sha256='beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64'; \ + sha256='92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x'; \ + sha256='1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/26-rc/cli/docker-entrypoint.sh b/26-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/26-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/26-rc/cli/modprobe.sh b/26-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/26-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/26-rc/dind-rootless/Dockerfile b/26-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..e4cc7b7ff --- /dev/null +++ b/26-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:26-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-26.0.0-rc1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/26-rc/dind/Dockerfile b/26-rc/dind/Dockerfile new file mode 100644 index 000000000..d319d34d5 --- /dev/null +++ b/26-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:26-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 + b="/sbin/${f/tables/tables-legacy}"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:26-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/26-rc/dind/dockerd-entrypoint.sh b/26-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..b11a1cffd --- /dev/null +++ b/26-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,232 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/26-rc/windows/windowsservercore-1809/Dockerfile b/26-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..e1f5c6f15 --- /dev/null +++ b/26-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 26.0.0-rc1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.12.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.24.6 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..663d0534d --- /dev/null +++ b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 26.0.0-rc1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.12.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.24.6 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 60e9108ac..76bd68145 100644 --- a/versions.json +++ b/versions.json @@ -280,5 +280,146 @@ ], "version": "25.0.3" }, - "25-rc": null + "25-rc": null, + "26": null, + "26-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-26.0.0-rc1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.12.1.linux-amd64", + "sha256": "716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.12.1.linux-arm-v6", + "sha256": "4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.12.1.linux-arm-v7", + "sha256": "fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.12.1.linux-arm64", + "sha256": "fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.12.1.linux-ppc64le", + "sha256": "1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.12.1.linux-riscv64", + "sha256": "152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.12.1.linux-s390x", + "sha256": "acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.12.1.windows-amd64.exe", + "sha256": "0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.12.1.windows-arm64.exe", + "sha256": "1eecfbd9a840b3bbd0b08fc83bb0a62bf40c67c4314cd0117117604b9b0255a1", + "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-arm64.exe" + } + }, + "version": "0.12.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "3eb451e8480cee3deb7f5c932d3da83e14cac543394136bf5da24fc9ad21b484", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "e270dea5d48958c7e477dc1713fd1d4c5409e38afba65bb5f092323c1d38df5f", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "535bde4683f6a0d8d877850d67a436db2452902e9913a599c78dd274bae0ba06", + "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.24.6" + }, + "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "26.0.0-rc1" + } } From 4afc3fcd95ded876a99b94ec60a383194254b6fa Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 5 Mar 2024 16:04:18 -0800 Subject: [PATCH 292/667] Update 24 to buildx 0.13.0 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 106d3b84c..884335eda 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.12.1 +ENV DOCKER_BUILDX_VERSION 0.13.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64'; \ - sha256='716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64'; \ + sha256='ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6'; \ - sha256='4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6'; \ + sha256='6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7'; \ - sha256='fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7'; \ + sha256='1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64'; \ - sha256='fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64'; \ + sha256='fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le'; \ - sha256='1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le'; \ + sha256='aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64'; \ - sha256='152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64'; \ + sha256='c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x'; \ - sha256='acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x'; \ + sha256='c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index a2cc4a854..5aed604aa 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 +ENV DOCKER_BUILDX_VERSION 0.13.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index f2c49b2ee..e943f680a 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 +ENV DOCKER_BUILDX_VERSION 0.13.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 76bd68145..a13385ab1 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.12.1.linux-amd64", - "sha256": "716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64" + "file": "buildx-v0.13.0.linux-amd64", + "sha256": "ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.12.1.linux-arm-v6", - "sha256": "4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6" + "file": "buildx-v0.13.0.linux-arm-v6", + "sha256": "6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.12.1.linux-arm-v7", - "sha256": "fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7" + "file": "buildx-v0.13.0.linux-arm-v7", + "sha256": "1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.12.1.linux-arm64", - "sha256": "fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64" + "file": "buildx-v0.13.0.linux-arm64", + "sha256": "fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.12.1.linux-ppc64le", - "sha256": "1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le" + "file": "buildx-v0.13.0.linux-ppc64le", + "sha256": "aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.12.1.linux-riscv64", - "sha256": "152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64" + "file": "buildx-v0.13.0.linux-riscv64", + "sha256": "c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.12.1.linux-s390x", - "sha256": "acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x" + "file": "buildx-v0.13.0.linux-s390x", + "sha256": "c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.12.1.windows-amd64.exe", - "sha256": "0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe" + "file": "buildx-v0.13.0.windows-amd64.exe", + "sha256": "001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.12.1.windows-arm64.exe", - "sha256": "1eecfbd9a840b3bbd0b08fc83bb0a62bf40c67c4314cd0117117604b9b0255a1", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-arm64.exe" + "file": "buildx-v0.13.0.windows-arm64.exe", + "sha256": "b12d30528423c9bdef06b06b42078d1d62bf9bc09a705697d18e5928be233170", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.exe" } }, - "version": "0.12.1" + "version": "0.13.0" }, "compose": { "arches": { From 8b4648c1f5cb4b5badccaed7b1dd6a56e9b7157e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 5 Mar 2024 16:06:07 -0800 Subject: [PATCH 293/667] Update 25 to buildx 0.13.0 --- 25/cli/Dockerfile | 30 +++++----- 25/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index cb17c4456..79ed03d74 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.12.1 +ENV DOCKER_BUILDX_VERSION 0.13.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64'; \ - sha256='716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64'; \ + sha256='ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6'; \ - sha256='4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6'; \ + sha256='6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7'; \ - sha256='fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7'; \ + sha256='1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64'; \ - sha256='fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64'; \ + sha256='fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le'; \ - sha256='1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le'; \ + sha256='aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64'; \ - sha256='152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64'; \ + sha256='c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x'; \ - sha256='acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x'; \ + sha256='c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 27f3e2bdb..93e091824 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 +ENV DOCKER_BUILDX_VERSION 0.13.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 91a0a7743..c3874c3d2 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 +ENV DOCKER_BUILDX_VERSION 0.13.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index a13385ab1..a806fa0ca 100644 --- a/versions.json +++ b/versions.json @@ -163,52 +163,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.12.1.linux-amd64", - "sha256": "716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64" + "file": "buildx-v0.13.0.linux-amd64", + "sha256": "ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.12.1.linux-arm-v6", - "sha256": "4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6" + "file": "buildx-v0.13.0.linux-arm-v6", + "sha256": "6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.12.1.linux-arm-v7", - "sha256": "fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7" + "file": "buildx-v0.13.0.linux-arm-v7", + "sha256": "1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.12.1.linux-arm64", - "sha256": "fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64" + "file": "buildx-v0.13.0.linux-arm64", + "sha256": "fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.12.1.linux-ppc64le", - "sha256": "1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le" + "file": "buildx-v0.13.0.linux-ppc64le", + "sha256": "aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.12.1.linux-riscv64", - "sha256": "152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64" + "file": "buildx-v0.13.0.linux-riscv64", + "sha256": "c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.12.1.linux-s390x", - "sha256": "acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x" + "file": "buildx-v0.13.0.linux-s390x", + "sha256": "c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.12.1.windows-amd64.exe", - "sha256": "0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe" + "file": "buildx-v0.13.0.windows-amd64.exe", + "sha256": "001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.12.1.windows-arm64.exe", - "sha256": "1eecfbd9a840b3bbd0b08fc83bb0a62bf40c67c4314cd0117117604b9b0255a1", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-arm64.exe" + "file": "buildx-v0.13.0.windows-arm64.exe", + "sha256": "b12d30528423c9bdef06b06b42078d1d62bf9bc09a705697d18e5928be233170", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.exe" } }, - "version": "0.12.1" + "version": "0.13.0" }, "compose": { "arches": { From 49796f023aebc647c37bd7d329340e606887cbda Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 5 Mar 2024 16:07:55 -0800 Subject: [PATCH 294/667] Update 26-rc to buildx 0.13.0 --- 26-rc/cli/Dockerfile | 30 +++++----- .../windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/26-rc/cli/Dockerfile b/26-rc/cli/Dockerfile index 83f29d5db..b4ca26524 100644 --- a/26-rc/cli/Dockerfile +++ b/26-rc/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.12.1 +ENV DOCKER_BUILDX_VERSION 0.13.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64'; \ - sha256='716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64'; \ + sha256='ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6'; \ - sha256='4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6'; \ + sha256='6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7'; \ - sha256='fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7'; \ + sha256='1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64'; \ - sha256='fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64'; \ + sha256='fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le'; \ - sha256='1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le'; \ + sha256='aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64'; \ - sha256='152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64'; \ + sha256='c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x'; \ - sha256='acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x'; \ + sha256='c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26-rc/windows/windowsservercore-1809/Dockerfile b/26-rc/windows/windowsservercore-1809/Dockerfile index e1f5c6f15..95cba2fbc 100644 --- a/26-rc/windows/windowsservercore-1809/Dockerfile +++ b/26-rc/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 +ENV DOCKER_BUILDX_VERSION 0.13.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile index 663d0534d..47e04f4ef 100644 --- a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.12.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5 +ENV DOCKER_BUILDX_VERSION 0.13.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index a806fa0ca..d568d1ec2 100644 --- a/versions.json +++ b/versions.json @@ -305,52 +305,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.12.1.linux-amd64", - "sha256": "716321df8ca9c82ffe96f37e9f4aa1199d4969795836dbd57ef72d12e3ac5085", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64" + "file": "buildx-v0.13.0.linux-amd64", + "sha256": "ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.12.1.linux-arm-v6", - "sha256": "4b3c78b59c0383ab21327e2902af2ea317e3b85e442b1cd776f0c2a7bbbb2999", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6" + "file": "buildx-v0.13.0.linux-arm-v6", + "sha256": "6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.12.1.linux-arm-v7", - "sha256": "fe0a9e7812051a72c47d009bf9373e76e23644cc3291c848ac4a9b6f237e9e75", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7" + "file": "buildx-v0.13.0.linux-arm-v7", + "sha256": "1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.12.1.linux-arm64", - "sha256": "fb72d627f2ee080bba70375c367f4292867821e29ca9a8cf485622f6ede8f436", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64" + "file": "buildx-v0.13.0.linux-arm64", + "sha256": "fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.12.1.linux-ppc64le", - "sha256": "1c649498d727183d82fb243e08856533ea90e8d63bfcd6f8b23b264dbcf7ea7a", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le" + "file": "buildx-v0.13.0.linux-ppc64le", + "sha256": "aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.12.1.linux-riscv64", - "sha256": "152e7b423c1ce888eb0a658321eb8c28cc1d09af01acd5c66eddf8474dddf55c", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64" + "file": "buildx-v0.13.0.linux-riscv64", + "sha256": "c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.12.1.linux-s390x", - "sha256": "acee98a9f0550bf2c6c1161cf8067c031ddf0c566c41de7db27847bb72e8ee0b", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x" + "file": "buildx-v0.13.0.linux-s390x", + "sha256": "c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.12.1.windows-amd64.exe", - "sha256": "0ff0853a09960ff8f454d5db7253d5d935f5538856ea4985a276cbd1b28a96a5", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe" + "file": "buildx-v0.13.0.windows-amd64.exe", + "sha256": "001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.12.1.windows-arm64.exe", - "sha256": "1eecfbd9a840b3bbd0b08fc83bb0a62bf40c67c4314cd0117117604b9b0255a1", - "url": "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-arm64.exe" + "file": "buildx-v0.13.0.windows-arm64.exe", + "sha256": "b12d30528423c9bdef06b06b42078d1d62bf9bc09a705697d18e5928be233170", + "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.exe" } }, - "version": "0.12.1" + "version": "0.13.0" }, "compose": { "arches": { From 9e83dce35a8093260f5718f057d1265f54a934ce Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 6 Mar 2024 10:04:17 -0800 Subject: [PATCH 295/667] Update 24 to compose 2.24.7 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 884335eda..9a90ab3dd 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.6 +ENV DOCKER_COMPOSE_VERSION 2.24.7 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64'; \ - sha256='eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64'; \ + sha256='19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6'; \ - sha256='9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6'; \ + sha256='c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7'; \ - sha256='14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7'; \ + sha256='72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64'; \ - sha256='05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64'; \ + sha256='86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le'; \ - sha256='beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le'; \ + sha256='236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64'; \ - sha256='92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64'; \ + sha256='eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x'; \ - sha256='1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x'; \ + sha256='23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 5aed604aa..4780c8574 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.6 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff +ENV DOCKER_COMPOSE_VERSION 2.24.7 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index e943f680a..94b1b6806 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.6 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff +ENV DOCKER_COMPOSE_VERSION 2.24.7 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index d568d1ec2..fd028aa97 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64" + "sha256": "19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6" + "sha256": "c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7" + "sha256": "72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64" + "sha256": "86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "3eb451e8480cee3deb7f5c932d3da83e14cac543394136bf5da24fc9ad21b484", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-x86_64" + "sha256": "b8731caf4a836a44f7dc1b7610aef8b346eb37f0f6705ac28a3d258db6b21635", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "e270dea5d48958c7e477dc1713fd1d4c5409e38afba65bb5f092323c1d38df5f", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-aarch64" + "sha256": "914c3fc880ee005fbf9600239b8adf42d485b7e1c853a2686c52405158b69f1b", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le" + "sha256": "236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64" + "sha256": "eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x" + "sha256": "23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe" + "sha256": "1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "535bde4683f6a0d8d877850d67a436db2452902e9913a599c78dd274bae0ba06", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-aarch64.exe" + "sha256": "00d19997a26261efdbef52595c9677f05f2a890ac478ccac22c29842951eddc9", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.6" + "version": "2.24.7" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 4403ffd5c9859ae05a7eaf85dda82876e31f7d46 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 6 Mar 2024 10:05:50 -0800 Subject: [PATCH 296/667] Update 25 to compose 2.24.7 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 79ed03d74..d76d2d9b7 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.6 +ENV DOCKER_COMPOSE_VERSION 2.24.7 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64'; \ - sha256='eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64'; \ + sha256='19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6'; \ - sha256='9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6'; \ + sha256='c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7'; \ - sha256='14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7'; \ + sha256='72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64'; \ - sha256='05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64'; \ + sha256='86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le'; \ - sha256='beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le'; \ + sha256='236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64'; \ - sha256='92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64'; \ + sha256='eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x'; \ - sha256='1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x'; \ + sha256='23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 93e091824..46ebe849f 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.6 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff +ENV DOCKER_COMPOSE_VERSION 2.24.7 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index c3874c3d2..10a0f90d4 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.6 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff +ENV DOCKER_COMPOSE_VERSION 2.24.7 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index fd028aa97..f11a1ab5a 100644 --- a/versions.json +++ b/versions.json @@ -214,61 +214,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64" + "sha256": "19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6" + "sha256": "c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7" + "sha256": "72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64" + "sha256": "86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "3eb451e8480cee3deb7f5c932d3da83e14cac543394136bf5da24fc9ad21b484", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-x86_64" + "sha256": "b8731caf4a836a44f7dc1b7610aef8b346eb37f0f6705ac28a3d258db6b21635", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "e270dea5d48958c7e477dc1713fd1d4c5409e38afba65bb5f092323c1d38df5f", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-aarch64" + "sha256": "914c3fc880ee005fbf9600239b8adf42d485b7e1c853a2686c52405158b69f1b", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le" + "sha256": "236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64" + "sha256": "eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x" + "sha256": "23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe" + "sha256": "1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "535bde4683f6a0d8d877850d67a436db2452902e9913a599c78dd274bae0ba06", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-aarch64.exe" + "sha256": "00d19997a26261efdbef52595c9677f05f2a890ac478ccac22c29842951eddc9", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.6" + "version": "2.24.7" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From f008144c8c11ace01286f550123dff828f968692 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 6 Mar 2024 10:07:30 -0800 Subject: [PATCH 297/667] Update 26-rc to compose 2.24.7 --- 26-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26-rc/cli/Dockerfile b/26-rc/cli/Dockerfile index b4ca26524..c036dab7b 100644 --- a/26-rc/cli/Dockerfile +++ b/26-rc/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.6 +ENV DOCKER_COMPOSE_VERSION 2.24.7 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64'; \ - sha256='eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64'; \ + sha256='19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6'; \ - sha256='9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6'; \ + sha256='c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7'; \ - sha256='14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7'; \ + sha256='72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64'; \ - sha256='05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64'; \ + sha256='86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le'; \ - sha256='beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le'; \ + sha256='236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64'; \ - sha256='92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64'; \ + sha256='eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x'; \ - sha256='1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d'; \ + url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x'; \ + sha256='23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26-rc/windows/windowsservercore-1809/Dockerfile b/26-rc/windows/windowsservercore-1809/Dockerfile index 95cba2fbc..2a0fcd0dd 100644 --- a/26-rc/windows/windowsservercore-1809/Dockerfile +++ b/26-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.6 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff +ENV DOCKER_COMPOSE_VERSION 2.24.7 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile index 47e04f4ef..51e9183f5 100644 --- a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.6 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff +ENV DOCKER_COMPOSE_VERSION 2.24.7 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f11a1ab5a..4ee17dc41 100644 --- a/versions.json +++ b/versions.json @@ -356,61 +356,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "eca30ae32dc451f9e6d6c8ddce078a76f23b355c3ca0ab391d58f59e87c0d310", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64" + "sha256": "19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "9cf3bd154108919fe93e3b06045a88da83b06f2d7799f300d2101e836a593436", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv6" + "sha256": "c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "14e1cae9322dee586dec2cf0026a2c039fd834fd6d27a14ef875e51f0aafe1a6", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-armv7" + "sha256": "72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "05b91fcc38d80378508dc42e027fa71f13431bdd3247139e51fa084e95c3de9c", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-aarch64" + "sha256": "86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "3eb451e8480cee3deb7f5c932d3da83e14cac543394136bf5da24fc9ad21b484", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-x86_64" + "sha256": "b8731caf4a836a44f7dc1b7610aef8b346eb37f0f6705ac28a3d258db6b21635", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "e270dea5d48958c7e477dc1713fd1d4c5409e38afba65bb5f092323c1d38df5f", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-darwin-aarch64" + "sha256": "914c3fc880ee005fbf9600239b8adf42d485b7e1c853a2686c52405158b69f1b", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "beb103c13748f381a6aee542ae15ca626a2d60867ddc20afa2409128affe83c9", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-ppc64le" + "sha256": "236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "92a33146cbec3f4c02c5d967d21d28516b0273e34c183fe9133eaa82a9606677", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-riscv64" + "sha256": "eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "1b4932489acfe35044eb924a1d6b4ed9047cd909b90b19008fb321998d9c178d", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-s390x" + "sha256": "23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7a25ec49a53320fbe218c59ac7aafb05440725894322d396d4b353ad198b9dff", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-x86_64.exe" + "sha256": "1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "535bde4683f6a0d8d877850d67a436db2452902e9913a599c78dd274bae0ba06", - "url": "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-windows-aarch64.exe" + "sha256": "00d19997a26261efdbef52595c9677f05f2a890ac478ccac22c29842951eddc9", + "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.6" + "version": "2.24.7" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From b20c5f3ee47bf40bd13c97ca973a9107658457e1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 7 Mar 2024 04:04:26 -0800 Subject: [PATCH 298/667] Update 25 to 25.0.4 --- 25/cli/Dockerfile | 10 +++++----- 25/dind-rootless/Dockerfile | 4 ++-- 25/dind/Dockerfile | 8 ++++---- 25/windows/windowsservercore-1809/Dockerfile | 4 ++-- 25/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index d76d2d9b7..35c4ac976 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 25.0.3 +ENV DOCKER_VERSION 25.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-25.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/dind-rootless/Dockerfile b/25/dind-rootless/Dockerfile index 3a400839c..5cb24ac18 100644 --- a/25/dind-rootless/Dockerfile +++ b/25/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-25.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/dind/Dockerfile b/25/dind/Dockerfile index 88837ded0..275867d16 100644 --- a/25/dind/Dockerfile +++ b/25/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 46ebe849f..dd1a8a73c 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/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 25.0.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.3.zip +ENV DOCKER_VERSION 25.0.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.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/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 10a0f90d4..118a4bed5 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/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 25.0.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.3.zip +ENV DOCKER_VERSION 25.0.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.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/versions.json b/versions.json index 4ee17dc41..ae3410ae1 100644 --- a/versions.json +++ b/versions.json @@ -143,21 +143,21 @@ "25": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.4.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.4.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.4.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.4.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.3.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.4.zip" } }, "buildx": { @@ -278,7 +278,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "25.0.3" + "version": "25.0.4" }, "25-rc": null, "26": null, From c15759ea0c0a9b6191e93d3e8b035757e90cf195 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 7 Mar 2024 13:18:50 -0800 Subject: [PATCH 299/667] Update 26-rc to 26.0.0-rc2 --- 26-rc/cli/Dockerfile | 10 +++++----- 26-rc/dind-rootless/Dockerfile | 4 ++-- 26-rc/dind/Dockerfile | 8 ++++---- 26-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/26-rc/cli/Dockerfile b/26-rc/cli/Dockerfile index c036dab7b..2e85da62a 100644 --- a/26-rc/cli/Dockerfile +++ b/26-rc/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 26.0.0-rc1 +ENV DOCKER_VERSION 26.0.0-rc2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26-rc/dind-rootless/Dockerfile b/26-rc/dind-rootless/Dockerfile index e4cc7b7ff..9fb63637c 100644 --- a/26-rc/dind-rootless/Dockerfile +++ b/26-rc/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/test/x86_64/docker-rootless-extras-26.0.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-26.0.0-rc2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26-rc/dind/Dockerfile b/26-rc/dind/Dockerfile index d319d34d5..32d2dcde7 100644 --- a/26-rc/dind/Dockerfile +++ b/26-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26-rc/windows/windowsservercore-1809/Dockerfile b/26-rc/windows/windowsservercore-1809/Dockerfile index 2a0fcd0dd..81e36a94e 100644 --- a/26-rc/windows/windowsservercore-1809/Dockerfile +++ b/26-rc/windows/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 26.0.0-rc1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc1.zip +ENV DOCKER_VERSION 26.0.0-rc2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc2.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/26-rc/windows/windowsservercore-ltsc2022/Dockerfile b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile index 51e9183f5..a80b8e65a 100644 --- a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26-rc/windows/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 26.0.0-rc1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc1.zip +ENV DOCKER_VERSION 26.0.0-rc2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc2.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/versions.json b/versions.json index ae3410ae1..19135cb02 100644 --- a/versions.json +++ b/versions.json @@ -285,21 +285,21 @@ "26-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-26.0.0-rc1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-26.0.0-rc2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc2.zip" } }, "buildx": { @@ -420,6 +420,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "26.0.0-rc1" + "version": "26.0.0-rc2" } } From 5fa8a39c90d41d7a84cf7255dd2ccb16d5fe07b6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 12 Mar 2024 16:04:29 -0700 Subject: [PATCH 300/667] Update 24 to buildx 0.13.1 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 9a90ab3dd..8c33c8087 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.13.0 +ENV DOCKER_BUILDX_VERSION 0.13.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64'; \ - sha256='ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64'; \ + sha256='3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6'; \ - sha256='6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6'; \ + sha256='643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7'; \ - sha256='1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7'; \ + sha256='8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64'; \ - sha256='fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64'; \ + sha256='3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le'; \ - sha256='aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le'; \ + sha256='1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64'; \ - sha256='c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64'; \ + sha256='202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x'; \ - sha256='c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x'; \ + sha256='71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 4780c8574..4fed6f62b 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 +ENV DOCKER_BUILDX_VERSION 0.13.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 94b1b6806..4959db30a 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 +ENV DOCKER_BUILDX_VERSION 0.13.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 19135cb02..bf8adc8a9 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.13.0.linux-amd64", - "sha256": "ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64" + "file": "buildx-v0.13.1.linux-amd64", + "sha256": "3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.13.0.linux-arm-v6", - "sha256": "6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6" + "file": "buildx-v0.13.1.linux-arm-v6", + "sha256": "643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.13.0.linux-arm-v7", - "sha256": "1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7" + "file": "buildx-v0.13.1.linux-arm-v7", + "sha256": "8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.13.0.linux-arm64", - "sha256": "fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64" + "file": "buildx-v0.13.1.linux-arm64", + "sha256": "3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.13.0.linux-ppc64le", - "sha256": "aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le" + "file": "buildx-v0.13.1.linux-ppc64le", + "sha256": "1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.13.0.linux-riscv64", - "sha256": "c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64" + "file": "buildx-v0.13.1.linux-riscv64", + "sha256": "202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.13.0.linux-s390x", - "sha256": "c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x" + "file": "buildx-v0.13.1.linux-s390x", + "sha256": "71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.13.0.windows-amd64.exe", - "sha256": "001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe" + "file": "buildx-v0.13.1.windows-amd64.exe", + "sha256": "6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.13.0.windows-arm64.exe", - "sha256": "b12d30528423c9bdef06b06b42078d1d62bf9bc09a705697d18e5928be233170", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.exe" + "file": "buildx-v0.13.1.windows-arm64.exe", + "sha256": "3b6b93c1798dd6573fc63dac31f1f18ecfda4ee2ba78be147d5e8d090160b8d9", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.exe" } }, - "version": "0.13.0" + "version": "0.13.1" }, "compose": { "arches": { From d9997a7f7fb75068c036bdc621d8326d2eb400fc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 12 Mar 2024 16:11:33 -0700 Subject: [PATCH 301/667] Update 25 to buildx 0.13.1 --- 25/cli/Dockerfile | 30 +++++----- 25/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 35c4ac976..686a0be15 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.13.0 +ENV DOCKER_BUILDX_VERSION 0.13.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64'; \ - sha256='ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64'; \ + sha256='3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6'; \ - sha256='6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6'; \ + sha256='643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7'; \ - sha256='1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7'; \ + sha256='8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64'; \ - sha256='fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64'; \ + sha256='3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le'; \ - sha256='aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le'; \ + sha256='1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64'; \ - sha256='c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64'; \ + sha256='202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x'; \ - sha256='c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x'; \ + sha256='71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index dd1a8a73c..0d0650230 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 +ENV DOCKER_BUILDX_VERSION 0.13.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 118a4bed5..f6e65047c 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 +ENV DOCKER_BUILDX_VERSION 0.13.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index bf8adc8a9..8fb0ba9d3 100644 --- a/versions.json +++ b/versions.json @@ -163,52 +163,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.13.0.linux-amd64", - "sha256": "ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64" + "file": "buildx-v0.13.1.linux-amd64", + "sha256": "3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.13.0.linux-arm-v6", - "sha256": "6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6" + "file": "buildx-v0.13.1.linux-arm-v6", + "sha256": "643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.13.0.linux-arm-v7", - "sha256": "1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7" + "file": "buildx-v0.13.1.linux-arm-v7", + "sha256": "8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.13.0.linux-arm64", - "sha256": "fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64" + "file": "buildx-v0.13.1.linux-arm64", + "sha256": "3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.13.0.linux-ppc64le", - "sha256": "aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le" + "file": "buildx-v0.13.1.linux-ppc64le", + "sha256": "1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.13.0.linux-riscv64", - "sha256": "c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64" + "file": "buildx-v0.13.1.linux-riscv64", + "sha256": "202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.13.0.linux-s390x", - "sha256": "c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x" + "file": "buildx-v0.13.1.linux-s390x", + "sha256": "71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.13.0.windows-amd64.exe", - "sha256": "001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe" + "file": "buildx-v0.13.1.windows-amd64.exe", + "sha256": "6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.13.0.windows-arm64.exe", - "sha256": "b12d30528423c9bdef06b06b42078d1d62bf9bc09a705697d18e5928be233170", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.exe" + "file": "buildx-v0.13.1.windows-arm64.exe", + "sha256": "3b6b93c1798dd6573fc63dac31f1f18ecfda4ee2ba78be147d5e8d090160b8d9", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.exe" } }, - "version": "0.13.0" + "version": "0.13.1" }, "compose": { "arches": { From b3432169a7feb5c561dad2bc7a64a69a07d7f2ef Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 12 Mar 2024 16:18:59 -0700 Subject: [PATCH 302/667] Update 26-rc to buildx 0.13.1 --- 26-rc/cli/Dockerfile | 30 +++++----- .../windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/26-rc/cli/Dockerfile b/26-rc/cli/Dockerfile index 2e85da62a..2e9009ff4 100644 --- a/26-rc/cli/Dockerfile +++ b/26-rc/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.13.0 +ENV DOCKER_BUILDX_VERSION 0.13.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64'; \ - sha256='ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64'; \ + sha256='3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6'; \ - sha256='6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6'; \ + sha256='643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7'; \ - sha256='1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7'; \ + sha256='8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64'; \ - sha256='fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64'; \ + sha256='3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le'; \ - sha256='aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le'; \ + sha256='1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64'; \ - sha256='c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64'; \ + sha256='202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x'; \ - sha256='c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196'; \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x'; \ + sha256='71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26-rc/windows/windowsservercore-1809/Dockerfile b/26-rc/windows/windowsservercore-1809/Dockerfile index 81e36a94e..be0da65a2 100644 --- a/26-rc/windows/windowsservercore-1809/Dockerfile +++ b/26-rc/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 +ENV DOCKER_BUILDX_VERSION 0.13.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile index a80b8e65a..4ef1a4bd7 100644 --- a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6 +ENV DOCKER_BUILDX_VERSION 0.13.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 8fb0ba9d3..5d3479691 100644 --- a/versions.json +++ b/versions.json @@ -305,52 +305,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.13.0.linux-amd64", - "sha256": "ddd69ee2ca3dd61760e771dcd2f3453dc677dfeb42c9484cc2321b96bc1b7c57", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64" + "file": "buildx-v0.13.1.linux-amd64", + "sha256": "3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.13.0.linux-arm-v6", - "sha256": "6aea498b2a168bcd13f919e85e0670c2e5a71abab8ecd6bfe52874d14680f617", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6" + "file": "buildx-v0.13.1.linux-arm-v6", + "sha256": "643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.13.0.linux-arm-v7", - "sha256": "1566b6f3cf69d06ade467d9928e19f6a6682182fe3008bc9a0c83385d5637fa9", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7" + "file": "buildx-v0.13.1.linux-arm-v7", + "sha256": "8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.13.0.linux-arm64", - "sha256": "fa36eb4deab2fac6ddf5fdeddcf16999bc9d5fb1d632e0ba7e572b519df8a656", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64" + "file": "buildx-v0.13.1.linux-arm64", + "sha256": "3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.13.0.linux-ppc64le", - "sha256": "aced23b7832c690703d0cb6339d4ccdbac9b45f0392b865b131aba9b572ae3c1", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le" + "file": "buildx-v0.13.1.linux-ppc64le", + "sha256": "1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.13.0.linux-riscv64", - "sha256": "c15e51986d59398552b3ecd50b4ca75779e42c878e34761df54616ac02165207", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64" + "file": "buildx-v0.13.1.linux-riscv64", + "sha256": "202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.13.0.linux-s390x", - "sha256": "c3578ab9814e4c2d0f917721b1dfd140b85e40602f6128745178a051cf4d0196", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x" + "file": "buildx-v0.13.1.linux-s390x", + "sha256": "71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.13.0.windows-amd64.exe", - "sha256": "001dd8c707862d7c7a7bc17ebb024922ee304bddad1bca11da5b3b3ff18effa6", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe" + "file": "buildx-v0.13.1.windows-amd64.exe", + "sha256": "6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.13.0.windows-arm64.exe", - "sha256": "b12d30528423c9bdef06b06b42078d1d62bf9bc09a705697d18e5928be233170", - "url": "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.exe" + "file": "buildx-v0.13.1.windows-arm64.exe", + "sha256": "3b6b93c1798dd6573fc63dac31f1f18ecfda4ee2ba78be147d5e8d090160b8d9", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.exe" } }, - "version": "0.13.0" + "version": "0.13.1" }, "compose": { "arches": { From db75b558c6fe6a048ac5416457c17f834df738f3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 15 Mar 2024 10:04:15 -0700 Subject: [PATCH 303/667] Update 24 to compose 2.25.0 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 8c33c8087..eb35780cc 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.7 +ENV DOCKER_COMPOSE_VERSION 2.25.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64'; \ - sha256='19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64'; \ + sha256='53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6'; \ - sha256='c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6'; \ + sha256='a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7'; \ - sha256='72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7'; \ + sha256='8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64'; \ - sha256='86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64'; \ + sha256='b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le'; \ - sha256='236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le'; \ + sha256='dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64'; \ - sha256='eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64'; \ + sha256='a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x'; \ - sha256='23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x'; \ + sha256='9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 4fed6f62b..a86c0badc 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.7 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 +ENV DOCKER_COMPOSE_VERSION 2.25.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 4959db30a..c36b99ca5 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.7 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 +ENV DOCKER_COMPOSE_VERSION 2.25.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 5d3479691..1c56396cf 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64" + "sha256": "53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6" + "sha256": "a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7" + "sha256": "8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64" + "sha256": "b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "b8731caf4a836a44f7dc1b7610aef8b346eb37f0f6705ac28a3d258db6b21635", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-x86_64" + "sha256": "db136ec87175a30460670aa7664ac548c0eb2542d29c0fac82adbcd12ed663b7", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "914c3fc880ee005fbf9600239b8adf42d485b7e1c853a2686c52405158b69f1b", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-aarch64" + "sha256": "7e307d20c9dc04a6374789d768061a23b80b1da56aeb421800292b6889f3f3e1", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le" + "sha256": "dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64" + "sha256": "a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x" + "sha256": "9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe" + "sha256": "27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "00d19997a26261efdbef52595c9677f05f2a890ac478ccac22c29842951eddc9", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-aarch64.exe" + "sha256": "cd52c7a65868ff50fa1aacebeb90dcea17284471fbd339bc68f514b1f247cb5a", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.7" + "version": "2.25.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 8712adb908210196bb9c993a12833caec0ca2f8e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 15 Mar 2024 10:06:27 -0700 Subject: [PATCH 304/667] Update 25 to compose 2.25.0 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 686a0be15..a4536a119 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.7 +ENV DOCKER_COMPOSE_VERSION 2.25.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64'; \ - sha256='19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64'; \ + sha256='53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6'; \ - sha256='c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6'; \ + sha256='a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7'; \ - sha256='72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7'; \ + sha256='8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64'; \ - sha256='86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64'; \ + sha256='b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le'; \ - sha256='236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le'; \ + sha256='dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64'; \ - sha256='eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64'; \ + sha256='a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x'; \ - sha256='23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x'; \ + sha256='9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 0d0650230..ed7c7c1ac 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.7 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 +ENV DOCKER_COMPOSE_VERSION 2.25.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index f6e65047c..ef6656416 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.7 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 +ENV DOCKER_COMPOSE_VERSION 2.25.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 1c56396cf..f331b3729 100644 --- a/versions.json +++ b/versions.json @@ -214,61 +214,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64" + "sha256": "53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6" + "sha256": "a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7" + "sha256": "8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64" + "sha256": "b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "b8731caf4a836a44f7dc1b7610aef8b346eb37f0f6705ac28a3d258db6b21635", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-x86_64" + "sha256": "db136ec87175a30460670aa7664ac548c0eb2542d29c0fac82adbcd12ed663b7", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "914c3fc880ee005fbf9600239b8adf42d485b7e1c853a2686c52405158b69f1b", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-aarch64" + "sha256": "7e307d20c9dc04a6374789d768061a23b80b1da56aeb421800292b6889f3f3e1", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le" + "sha256": "dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64" + "sha256": "a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x" + "sha256": "9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe" + "sha256": "27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "00d19997a26261efdbef52595c9677f05f2a890ac478ccac22c29842951eddc9", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-aarch64.exe" + "sha256": "cd52c7a65868ff50fa1aacebeb90dcea17284471fbd339bc68f514b1f247cb5a", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.7" + "version": "2.25.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From e624c032dc98cac5108d5c655bf54728b30924b4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 15 Mar 2024 10:08:59 -0700 Subject: [PATCH 305/667] Update 26-rc to compose 2.25.0 --- 26-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26-rc/cli/Dockerfile b/26-rc/cli/Dockerfile index 2e9009ff4..87debb6c8 100644 --- a/26-rc/cli/Dockerfile +++ b/26-rc/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.24.7 +ENV DOCKER_COMPOSE_VERSION 2.25.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64'; \ - sha256='19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64'; \ + sha256='53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6'; \ - sha256='c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6'; \ + sha256='a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7'; \ - sha256='72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7'; \ + sha256='8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64'; \ - sha256='86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64'; \ + sha256='b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le'; \ - sha256='236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le'; \ + sha256='dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64'; \ - sha256='eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64'; \ + sha256='a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x'; \ - sha256='23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e'; \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x'; \ + sha256='9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26-rc/windows/windowsservercore-1809/Dockerfile b/26-rc/windows/windowsservercore-1809/Dockerfile index be0da65a2..5c36ac7fb 100644 --- a/26-rc/windows/windowsservercore-1809/Dockerfile +++ b/26-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.7 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 +ENV DOCKER_COMPOSE_VERSION 2.25.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile index 4ef1a4bd7..c72422763 100644 --- a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.24.7 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0 +ENV DOCKER_COMPOSE_VERSION 2.25.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f331b3729..0be39ede0 100644 --- a/versions.json +++ b/versions.json @@ -356,61 +356,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "19c9deb6f4d3915f5c93441b8d2da751a09af82df62d55eab097c2cbfebd519f", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-x86_64" + "sha256": "53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "c9fb575152f757a5edcce8ca0a399de6ba8dfacd80a8c730f56f0957cadb5858", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv6" + "sha256": "a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "72ec3b7726b5784cf4ac14e2c32781f5090cb57a2951cfc59b24a74a88e9ce79", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-armv7" + "sha256": "8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "86fa6982c55e1bb741ac71ebbbb78c715224eeb46a820364ec6075cf87047d53", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-aarch64" + "sha256": "b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "b8731caf4a836a44f7dc1b7610aef8b346eb37f0f6705ac28a3d258db6b21635", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-x86_64" + "sha256": "db136ec87175a30460670aa7664ac548c0eb2542d29c0fac82adbcd12ed663b7", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "914c3fc880ee005fbf9600239b8adf42d485b7e1c853a2686c52405158b69f1b", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-darwin-aarch64" + "sha256": "7e307d20c9dc04a6374789d768061a23b80b1da56aeb421800292b6889f3f3e1", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "236176989b202caebce42629d57f6faad310159c1c1b826feb63a097910bd0a5", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-ppc64le" + "sha256": "dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "eacbc70fd96c4c9a20bd58fc91a756372ece659211b9f566da33e15112c0b2af", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-riscv64" + "sha256": "a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "23a643f8994c945683f62669cd0f44bc106d3312ea04c3dda39d7514f0b1035e", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-linux-s390x" + "sha256": "9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "1a5ffa12cff51a65f4e5e8874ed46b0783cfbc8f5ef837f5b9523decf1afd1d0", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-x86_64.exe" + "sha256": "27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "00d19997a26261efdbef52595c9677f05f2a890ac478ccac22c29842951eddc9", - "url": "https://github.com/docker/compose/releases/download/v2.24.7/docker-compose-windows-aarch64.exe" + "sha256": "cd52c7a65868ff50fa1aacebeb90dcea17284471fbd339bc68f514b1f247cb5a", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.24.7" + "version": "2.25.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From a40d64fc2cc3b417f9408d3b1c539ec860780e86 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 19 Mar 2024 14:53:23 -0700 Subject: [PATCH 306/667] Update 25 to 25.0.5 --- 25/cli/Dockerfile | 10 +++++----- 25/dind-rootless/Dockerfile | 4 ++-- 25/dind/Dockerfile | 8 ++++---- 25/windows/windowsservercore-1809/Dockerfile | 4 ++-- 25/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index a4536a119..6c4cde761 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 25.0.4 +ENV DOCKER_VERSION 25.0.5 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.5.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.5.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/dind-rootless/Dockerfile b/25/dind-rootless/Dockerfile index 5cb24ac18..7023e591c 100644 --- a/25/dind-rootless/Dockerfile +++ b/25/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-25.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/dind/Dockerfile b/25/dind/Dockerfile index 275867d16..4b836621f 100644 --- a/25/dind/Dockerfile +++ b/25/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.5.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-25.0.5.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index ed7c7c1ac..097e4ab7e 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/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 25.0.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.4.zip +ENV DOCKER_VERSION 25.0.5 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.5.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/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index ef6656416..92d348ce9 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/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 25.0.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.4.zip +ENV DOCKER_VERSION 25.0.5 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.5.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/versions.json b/versions.json index 0be39ede0..debb3617c 100644 --- a/versions.json +++ b/versions.json @@ -143,21 +143,21 @@ "25": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.5.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.5.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.5.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.5.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.5.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.5.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.4.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.5.zip" } }, "buildx": { @@ -278,7 +278,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "25.0.4" + "version": "25.0.5" }, "25-rc": null, "26": null, From 1ca3ec178ea45b3b8d74a007e76a743157b00bbf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 19 Mar 2024 22:04:39 -0700 Subject: [PATCH 307/667] Update 26-rc to 26.0.0-rc3 --- 26-rc/cli/Dockerfile | 10 +++++----- 26-rc/dind-rootless/Dockerfile | 4 ++-- 26-rc/dind/Dockerfile | 8 ++++---- 26-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/26-rc/cli/Dockerfile b/26-rc/cli/Dockerfile index 87debb6c8..a4285c913 100644 --- a/26-rc/cli/Dockerfile +++ b/26-rc/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 26.0.0-rc2 +ENV DOCKER_VERSION 26.0.0-rc3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26-rc/dind-rootless/Dockerfile b/26-rc/dind-rootless/Dockerfile index 9fb63637c..efac6afd9 100644 --- a/26-rc/dind-rootless/Dockerfile +++ b/26-rc/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/test/x86_64/docker-rootless-extras-26.0.0-rc2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-26.0.0-rc3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26-rc/dind/Dockerfile b/26-rc/dind/Dockerfile index 32d2dcde7..f909225f4 100644 --- a/26-rc/dind/Dockerfile +++ b/26-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26-rc/windows/windowsservercore-1809/Dockerfile b/26-rc/windows/windowsservercore-1809/Dockerfile index 5c36ac7fb..4ee011c84 100644 --- a/26-rc/windows/windowsservercore-1809/Dockerfile +++ b/26-rc/windows/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 26.0.0-rc2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc2.zip +ENV DOCKER_VERSION 26.0.0-rc3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc3.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/26-rc/windows/windowsservercore-ltsc2022/Dockerfile b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile index c72422763..2a3ec4cf6 100644 --- a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26-rc/windows/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 26.0.0-rc2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc2.zip +ENV DOCKER_VERSION 26.0.0-rc3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc3.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/versions.json b/versions.json index debb3617c..3c9a17247 100644 --- a/versions.json +++ b/versions.json @@ -285,21 +285,21 @@ "26-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-26.0.0-rc2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-26.0.0-rc3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc2.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc3.zip" } }, "buildx": { @@ -420,6 +420,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "26.0.0-rc2" + "version": "26.0.0-rc3" } } From 79c28eb1b838542a8e6732b66d00839d426bd589 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 20 Mar 2024 14:16:36 -0700 Subject: [PATCH 308/667] Update 26 to 26.0.0, buildx 0.13.1, compose 2.25.0 --- 26/cli/Dockerfile | 165 +++++++++++++ 26/cli/docker-entrypoint.sh | 61 +++++ 26/cli/modprobe.sh | 20 ++ 26/dind-rootless/Dockerfile | 55 +++++ 26/dind/Dockerfile | 108 ++++++++ 26/dind/dockerd-entrypoint.sh | 232 ++++++++++++++++++ 26/windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ versions.json | 141 ++++++++++- 9 files changed, 963 insertions(+), 1 deletion(-) create mode 100644 26/cli/Dockerfile create mode 100755 26/cli/docker-entrypoint.sh create mode 100755 26/cli/modprobe.sh create mode 100644 26/dind-rootless/Dockerfile create mode 100644 26/dind/Dockerfile create mode 100755 26/dind/dockerd-entrypoint.sh create mode 100644 26/windows/windowsservercore-1809/Dockerfile create mode 100644 26/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile new file mode 100644 index 000000000..093c5520e --- /dev/null +++ b/26/cli/Dockerfile @@ -0,0 +1,165 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.19 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 26.0.0 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.0.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.13.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64'; \ + sha256='3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6'; \ + sha256='643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7'; \ + sha256='8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64'; \ + sha256='3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le'; \ + sha256='1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64'; \ + sha256='202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x'; \ + sha256='71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.25.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64'; \ + sha256='53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6'; \ + sha256='a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7'; \ + sha256='8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64'; \ + sha256='b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le'; \ + sha256='dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64'; \ + sha256='a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x'; \ + sha256='9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/26/cli/docker-entrypoint.sh b/26/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/26/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/26/cli/modprobe.sh b/26/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/26/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/26/dind-rootless/Dockerfile b/26/dind-rootless/Dockerfile new file mode 100644 index 000000000..f8164367d --- /dev/null +++ b/26/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:26-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +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-26.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/26/dind/Dockerfile b/26/dind/Dockerfile new file mode 100644 index 000000000..8fc51425e --- /dev/null +++ b/26/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:26-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 + b="/sbin/${f/tables/tables-legacy}"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.0.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:26-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/26/dind/dockerd-entrypoint.sh b/26/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..b11a1cffd --- /dev/null +++ b/26/dind/dockerd-entrypoint.sh @@ -0,0 +1,232 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..e62ff0d81 --- /dev/null +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 26.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.13.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.25.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..673bbf05d --- /dev/null +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 26.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.13.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.25.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 3c9a17247..d744ae4ce 100644 --- a/versions.json +++ b/versions.json @@ -281,7 +281,146 @@ "version": "25.0.5" }, "25-rc": null, - "26": null, + "26": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.0.0.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.0.0.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.0.0.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.0.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.0.0.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.13.1.linux-amd64", + "sha256": "3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.13.1.linux-arm-v6", + "sha256": "643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.13.1.linux-arm-v7", + "sha256": "8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.13.1.linux-arm64", + "sha256": "3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.13.1.linux-ppc64le", + "sha256": "1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.13.1.linux-riscv64", + "sha256": "202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.13.1.linux-s390x", + "sha256": "71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.13.1.windows-amd64.exe", + "sha256": "6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.13.1.windows-arm64.exe", + "sha256": "3b6b93c1798dd6573fc63dac31f1f18ecfda4ee2ba78be147d5e8d090160b8d9", + "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.exe" + } + }, + "version": "0.13.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "db136ec87175a30460670aa7664ac548c0eb2542d29c0fac82adbcd12ed663b7", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "7e307d20c9dc04a6374789d768061a23b80b1da56aeb421800292b6889f3f3e1", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "cd52c7a65868ff50fa1aacebeb90dcea17284471fbd339bc68f514b1f247cb5a", + "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.25.0" + }, + "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "26.0.0" + }, "26-rc": { "arches": { "amd64": { From a2ee2b46af0eeb19b32e8ed31a1e7e5ae326641c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 20 Mar 2024 14:18:25 -0700 Subject: [PATCH 309/667] Update 26-rc --- 26-rc/cli/Dockerfile | 165 ------------- 26-rc/cli/docker-entrypoint.sh | 61 ----- 26-rc/cli/modprobe.sh | 20 -- 26-rc/dind-rootless/Dockerfile | 55 ----- 26-rc/dind/Dockerfile | 108 -------- 26-rc/dind/dockerd-entrypoint.sh | 232 ------------------ .../windows/windowsservercore-1809/Dockerfile | 91 ------- .../windowsservercore-ltsc2022/Dockerfile | 91 ------- versions.json | 141 +---------- 9 files changed, 1 insertion(+), 963 deletions(-) delete mode 100644 26-rc/cli/Dockerfile delete mode 100755 26-rc/cli/docker-entrypoint.sh delete mode 100755 26-rc/cli/modprobe.sh delete mode 100644 26-rc/dind-rootless/Dockerfile delete mode 100644 26-rc/dind/Dockerfile delete mode 100755 26-rc/dind/dockerd-entrypoint.sh delete mode 100644 26-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 26-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/26-rc/cli/Dockerfile b/26-rc/cli/Dockerfile deleted file mode 100644 index a4285c913..000000000 --- a/26-rc/cli/Dockerfile +++ /dev/null @@ -1,165 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.19 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 26.0.0-rc3 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc3.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc3.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.13.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64'; \ - sha256='3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6'; \ - sha256='643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7'; \ - sha256='8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64'; \ - sha256='3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le'; \ - sha256='1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64'; \ - sha256='202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x'; \ - sha256='71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.25.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64'; \ - sha256='53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6'; \ - sha256='a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7'; \ - sha256='8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64'; \ - sha256='b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le'; \ - sha256='dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64'; \ - sha256='a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x'; \ - sha256='9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/26-rc/cli/docker-entrypoint.sh b/26-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/26-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/26-rc/cli/modprobe.sh b/26-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/26-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/26-rc/dind-rootless/Dockerfile b/26-rc/dind-rootless/Dockerfile deleted file mode 100644 index efac6afd9..000000000 --- a/26-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:26-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-26.0.0-rc3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/26-rc/dind/Dockerfile b/26-rc/dind/Dockerfile deleted file mode 100644 index f909225f4..000000000 --- a/26-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:26-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 - b="/sbin/${f/tables/tables-legacy}"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc3.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc3.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:26-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/26-rc/dind/dockerd-entrypoint.sh b/26-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index b11a1cffd..000000000 --- a/26-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,232 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/26-rc/windows/windowsservercore-1809/Dockerfile b/26-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 4ee011c84..000000000 --- a/26-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 26.0.0-rc3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc3.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.25.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile b/26-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 2a3ec4cf6..000000000 --- a/26-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 26.0.0-rc3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc3.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.25.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index d744ae4ce..bdb45a4ab 100644 --- a/versions.json +++ b/versions.json @@ -421,144 +421,5 @@ ], "version": "26.0.0" }, - "26-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-26.0.0-rc3.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc3.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc3.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc3.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc3.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.13.1.linux-amd64", - "sha256": "3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.13.1.linux-arm-v6", - "sha256": "643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.13.1.linux-arm-v7", - "sha256": "8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.13.1.linux-arm64", - "sha256": "3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64" - }, - "ppc64le": { - "file": "buildx-v0.13.1.linux-ppc64le", - "sha256": "1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.13.1.linux-riscv64", - "sha256": "202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.13.1.linux-s390x", - "sha256": "71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.13.1.windows-amd64.exe", - "sha256": "6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.13.1.windows-arm64.exe", - "sha256": "3b6b93c1798dd6573fc63dac31f1f18ecfda4ee2ba78be147d5e8d090160b8d9", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.exe" - } - }, - "version": "0.13.1" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "db136ec87175a30460670aa7664ac548c0eb2542d29c0fac82adbcd12ed663b7", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "7e307d20c9dc04a6374789d768061a23b80b1da56aeb421800292b6889f3f3e1", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "cd52c7a65868ff50fa1aacebeb90dcea17284471fbd339bc68f514b1f247cb5a", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.25.0" - }, - "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "26.0.0-rc3" - } + "26-rc": null } From ec77bfcb08da44c1f7c7440f9c44c0c3c905044e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 22 Mar 2024 16:04:14 -0700 Subject: [PATCH 310/667] Update 24 to compose 2.26.0 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index eb35780cc..b7300ced3 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.25.0 +ENV DOCKER_COMPOSE_VERSION 2.26.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64'; \ - sha256='53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64'; \ + sha256='59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6'; \ - sha256='a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6'; \ + sha256='97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7'; \ - sha256='8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7'; \ + sha256='d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64'; \ - sha256='b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64'; \ + sha256='6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le'; \ - sha256='dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le'; \ + sha256='e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64'; \ - sha256='a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64'; \ + sha256='1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x'; \ - sha256='9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x'; \ + sha256='5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index a86c0badc..742963c8d 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.25.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb +ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index c36b99ca5..94daf3e77 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.25.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb +ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index bdb45a4ab..7b6e82aee 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64" + "sha256": "59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6" + "sha256": "97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7" + "sha256": "d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64" + "sha256": "6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "db136ec87175a30460670aa7664ac548c0eb2542d29c0fac82adbcd12ed663b7", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-x86_64" + "sha256": "90aac9e3dfd1ab57446347d6dc65ce2570d9d6165cf1b1f2185d1a6387746a45", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7e307d20c9dc04a6374789d768061a23b80b1da56aeb421800292b6889f3f3e1", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-aarch64" + "sha256": "7443f0c51d9fcb8865a5ed4cf569c2db116b7d2a4762332ca06960ca3a622e72", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le" + "sha256": "e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64" + "sha256": "1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x" + "sha256": "5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe" + "sha256": "0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "cd52c7a65868ff50fa1aacebeb90dcea17284471fbd339bc68f514b1f247cb5a", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-aarch64.exe" + "sha256": "faf75b42e75980e8eb0b7d5f6abcffaed444a190d86ac0223c4ab4eb809b564c", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.25.0" + "version": "2.26.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From bd877487a10c59ccab6b0712bb84ec3c428cd8bc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 22 Mar 2024 16:05:50 -0700 Subject: [PATCH 311/667] Update 25 to compose 2.26.0 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 6c4cde761..cdb0b7dff 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.25.0 +ENV DOCKER_COMPOSE_VERSION 2.26.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64'; \ - sha256='53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64'; \ + sha256='59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6'; \ - sha256='a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6'; \ + sha256='97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7'; \ - sha256='8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7'; \ + sha256='d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64'; \ - sha256='b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64'; \ + sha256='6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le'; \ - sha256='dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le'; \ + sha256='e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64'; \ - sha256='a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64'; \ + sha256='1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x'; \ - sha256='9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x'; \ + sha256='5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 097e4ab7e..8768cfdf6 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.25.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb +ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 92d348ce9..405d6e6d9 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.25.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb +ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 7b6e82aee..3f908c9da 100644 --- a/versions.json +++ b/versions.json @@ -214,61 +214,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64" + "sha256": "59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6" + "sha256": "97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7" + "sha256": "d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64" + "sha256": "6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "db136ec87175a30460670aa7664ac548c0eb2542d29c0fac82adbcd12ed663b7", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-x86_64" + "sha256": "90aac9e3dfd1ab57446347d6dc65ce2570d9d6165cf1b1f2185d1a6387746a45", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7e307d20c9dc04a6374789d768061a23b80b1da56aeb421800292b6889f3f3e1", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-aarch64" + "sha256": "7443f0c51d9fcb8865a5ed4cf569c2db116b7d2a4762332ca06960ca3a622e72", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le" + "sha256": "e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64" + "sha256": "1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x" + "sha256": "5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe" + "sha256": "0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "cd52c7a65868ff50fa1aacebeb90dcea17284471fbd339bc68f514b1f247cb5a", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-aarch64.exe" + "sha256": "faf75b42e75980e8eb0b7d5f6abcffaed444a190d86ac0223c4ab4eb809b564c", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.25.0" + "version": "2.26.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From f8169b09216030a793b7d2d9349e345472e48690 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 22 Mar 2024 16:07:24 -0700 Subject: [PATCH 312/667] Update 26 to compose 2.26.0 --- 26/cli/Dockerfile | 30 ++++++------ 26/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 093c5520e..2b1acf284 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.25.0 +ENV DOCKER_COMPOSE_VERSION 2.26.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64'; \ - sha256='53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64'; \ + sha256='59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6'; \ - sha256='a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6'; \ + sha256='97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7'; \ - sha256='8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7'; \ + sha256='d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64'; \ - sha256='b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64'; \ + sha256='6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le'; \ - sha256='dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le'; \ + sha256='e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64'; \ - sha256='a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64'; \ + sha256='1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x'; \ - sha256='9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x'; \ + sha256='5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index e62ff0d81..d20c0feea 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.25.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb +ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 673bbf05d..20c5ec588 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.25.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb +ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 3f908c9da..1907fd15c 100644 --- a/versions.json +++ b/versions.json @@ -355,61 +355,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "53641b8a28419f947bc58c085e0c39b97a209b6e875a25c585e7fab44ff48576", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-x86_64" + "sha256": "59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a123b79b530a65c7381ca8bb3b29cde7177f4f260984a127d998c9696cae794c", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv6" + "sha256": "97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "8ea72e93e8da8259d7d5d051f3c65dc14c44a23d5ebc6939394d7d03b147e238", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-armv7" + "sha256": "d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "b9f303c9f9db75ecf18ea6fc516b3dc54a3e54f3b3d8e7f1a449416522958bc5", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-aarch64" + "sha256": "6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "db136ec87175a30460670aa7664ac548c0eb2542d29c0fac82adbcd12ed663b7", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-x86_64" + "sha256": "90aac9e3dfd1ab57446347d6dc65ce2570d9d6165cf1b1f2185d1a6387746a45", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7e307d20c9dc04a6374789d768061a23b80b1da56aeb421800292b6889f3f3e1", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-darwin-aarch64" + "sha256": "7443f0c51d9fcb8865a5ed4cf569c2db116b7d2a4762332ca06960ca3a622e72", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "dc067ab61239cef3d2e145d37fcd68c1fc2320c6728d77a9a4ec4fb0e6c6dd64", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-ppc64le" + "sha256": "e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "a17f07604fa74c661e62d5e27ae358f8a611f42bb9a4a147cec76b8bb591bea4", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-riscv64" + "sha256": "1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "9e613275e5fa46cb864d3f2fccb10e3239b879527d075490b03e381df56c397c", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-linux-s390x" + "sha256": "5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "27289c82fe3ee64eaa415ae47f028f7c6af6ab347f1af4fde0e0d7d2b4a84dbb", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-x86_64.exe" + "sha256": "0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "cd52c7a65868ff50fa1aacebeb90dcea17284471fbd339bc68f514b1f247cb5a", - "url": "https://github.com/docker/compose/releases/download/v2.25.0/docker-compose-windows-aarch64.exe" + "sha256": "faf75b42e75980e8eb0b7d5f6abcffaed444a190d86ac0223c4ab4eb809b564c", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.25.0" + "version": "2.26.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 5ba7119e906c53f07ef5232d57ce7e1cb09833d9 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 29 Mar 2024 10:04:14 -0700 Subject: [PATCH 313/667] Update 24 to compose 2.26.1 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index b7300ced3..922e858f7 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_VERSION 2.26.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64'; \ - sha256='59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64'; \ + sha256='2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6'; \ - sha256='97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6'; \ + sha256='69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7'; \ - sha256='d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7'; \ + sha256='82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64'; \ - sha256='6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64'; \ + sha256='c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le'; \ - sha256='e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le'; \ + sha256='4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64'; \ - sha256='1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64'; \ + sha256='575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x'; \ - sha256='5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x'; \ + sha256='cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 742963c8d..e76e2c58d 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 +ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 94daf3e77..56421d3c2 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 +ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 1907fd15c..573552d00 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64" + "sha256": "2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6" + "sha256": "69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7" + "sha256": "82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64" + "sha256": "c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "90aac9e3dfd1ab57446347d6dc65ce2570d9d6165cf1b1f2185d1a6387746a45", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-x86_64" + "sha256": "f6bbd3739b93e625991414ec16a13d7be3e33321bcd618bf19634b92b6ee2a1e", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7443f0c51d9fcb8865a5ed4cf569c2db116b7d2a4762332ca06960ca3a622e72", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-aarch64" + "sha256": "620f5473f0c738b5f7f8409ca26aafca4572668c1ed9e628db5513df970459b4", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le" + "sha256": "4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64" + "sha256": "575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x" + "sha256": "cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe" + "sha256": "d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "faf75b42e75980e8eb0b7d5f6abcffaed444a190d86ac0223c4ab4eb809b564c", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-aarch64.exe" + "sha256": "ba686e16da205b1f0fd16d75c1472cf4246823c5f7a8fed4300dffd069135ccf", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.26.0" + "version": "2.26.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From dadf9acd722ef68923b970308e39d7820e28857a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 29 Mar 2024 10:05:43 -0700 Subject: [PATCH 314/667] Update 25 to compose 2.26.1 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index cdb0b7dff..ba6e0d0a7 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_VERSION 2.26.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64'; \ - sha256='59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64'; \ + sha256='2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6'; \ - sha256='97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6'; \ + sha256='69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7'; \ - sha256='d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7'; \ + sha256='82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64'; \ - sha256='6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64'; \ + sha256='c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le'; \ - sha256='e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le'; \ + sha256='4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64'; \ - sha256='1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64'; \ + sha256='575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x'; \ - sha256='5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x'; \ + sha256='cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 8768cfdf6..d6d1f0d77 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 +ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 405d6e6d9..5ef6d5928 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 +ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 573552d00..f5e223717 100644 --- a/versions.json +++ b/versions.json @@ -214,61 +214,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64" + "sha256": "2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6" + "sha256": "69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7" + "sha256": "82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64" + "sha256": "c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "90aac9e3dfd1ab57446347d6dc65ce2570d9d6165cf1b1f2185d1a6387746a45", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-x86_64" + "sha256": "f6bbd3739b93e625991414ec16a13d7be3e33321bcd618bf19634b92b6ee2a1e", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7443f0c51d9fcb8865a5ed4cf569c2db116b7d2a4762332ca06960ca3a622e72", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-aarch64" + "sha256": "620f5473f0c738b5f7f8409ca26aafca4572668c1ed9e628db5513df970459b4", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le" + "sha256": "4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64" + "sha256": "575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x" + "sha256": "cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe" + "sha256": "d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "faf75b42e75980e8eb0b7d5f6abcffaed444a190d86ac0223c4ab4eb809b564c", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-aarch64.exe" + "sha256": "ba686e16da205b1f0fd16d75c1472cf4246823c5f7a8fed4300dffd069135ccf", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.26.0" + "version": "2.26.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 1d101cc2a35b846215c3784deec80ab98f2847b5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 29 Mar 2024 10:07:07 -0700 Subject: [PATCH 315/667] Update 26 to compose 2.26.1 --- 26/cli/Dockerfile | 30 ++++++------ 26/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 2b1acf284..d20a1317d 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_VERSION 2.26.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64'; \ - sha256='59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64'; \ + sha256='2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6'; \ - sha256='97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6'; \ + sha256='69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7'; \ - sha256='d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7'; \ + sha256='82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64'; \ - sha256='6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64'; \ + sha256='c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le'; \ - sha256='e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le'; \ + sha256='4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64'; \ - sha256='1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64'; \ + sha256='575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x'; \ - sha256='5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x'; \ + sha256='cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index d20c0feea..5b7a12d78 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 +ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 20c5ec588..879dcd0b1 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 +ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f5e223717..cc4d90ec5 100644 --- a/versions.json +++ b/versions.json @@ -355,61 +355,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64" + "sha256": "2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6" + "sha256": "69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7" + "sha256": "82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64" + "sha256": "c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "90aac9e3dfd1ab57446347d6dc65ce2570d9d6165cf1b1f2185d1a6387746a45", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-x86_64" + "sha256": "f6bbd3739b93e625991414ec16a13d7be3e33321bcd618bf19634b92b6ee2a1e", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7443f0c51d9fcb8865a5ed4cf569c2db116b7d2a4762332ca06960ca3a622e72", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-aarch64" + "sha256": "620f5473f0c738b5f7f8409ca26aafca4572668c1ed9e628db5513df970459b4", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le" + "sha256": "4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64" + "sha256": "575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x" + "sha256": "cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe" + "sha256": "d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "faf75b42e75980e8eb0b7d5f6abcffaed444a190d86ac0223c4ab4eb809b564c", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-aarch64.exe" + "sha256": "ba686e16da205b1f0fd16d75c1472cf4246823c5f7a8fed4300dffd069135ccf", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.26.0" + "version": "2.26.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 9b7730d06c32e4e5521e8a3061bd200a77f2132a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 1 Apr 2024 16:06:35 -0700 Subject: [PATCH 316/667] Update 26 to compose 2.26.0 --- 26/cli/Dockerfile | 30 ++++++------ 26/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index d20a1317d..2b1acf284 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_VERSION 2.26.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64'; \ - sha256='2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64'; \ + sha256='59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6'; \ - sha256='69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6'; \ + sha256='97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7'; \ - sha256='82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7'; \ + sha256='d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64'; \ - sha256='c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64'; \ + sha256='6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le'; \ - sha256='4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le'; \ + sha256='e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64'; \ - sha256='575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64'; \ + sha256='1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x'; \ - sha256='cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9'; \ + url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x'; \ + sha256='5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 5b7a12d78..d20c0feea 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 +ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 879dcd0b1..20c5ec588 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 +ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index cc4d90ec5..f5e223717 100644 --- a/versions.json +++ b/versions.json @@ -355,61 +355,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64" + "sha256": "59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6" + "sha256": "97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7" + "sha256": "d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64" + "sha256": "6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "f6bbd3739b93e625991414ec16a13d7be3e33321bcd618bf19634b92b6ee2a1e", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-x86_64" + "sha256": "90aac9e3dfd1ab57446347d6dc65ce2570d9d6165cf1b1f2185d1a6387746a45", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "620f5473f0c738b5f7f8409ca26aafca4572668c1ed9e628db5513df970459b4", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-aarch64" + "sha256": "7443f0c51d9fcb8865a5ed4cf569c2db116b7d2a4762332ca06960ca3a622e72", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le" + "sha256": "e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64" + "sha256": "1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x" + "sha256": "5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe" + "sha256": "0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "ba686e16da205b1f0fd16d75c1472cf4246823c5f7a8fed4300dffd069135ccf", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-aarch64.exe" + "sha256": "faf75b42e75980e8eb0b7d5f6abcffaed444a190d86ac0223c4ab4eb809b564c", + "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.26.1" + "version": "2.26.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 9329f887d474baa4ecf6e55c5e65a93b4e3beff8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 1 Apr 2024 16:45:01 -0700 Subject: [PATCH 317/667] Update 26 to compose 2.26.1 --- 26/cli/Dockerfile | 30 ++++++------ 26/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 2b1acf284..d20a1317d 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.26.0 +ENV DOCKER_COMPOSE_VERSION 2.26.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64'; \ - sha256='59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64'; \ + sha256='2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6'; \ - sha256='97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6'; \ + sha256='69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7'; \ - sha256='d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7'; \ + sha256='82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64'; \ - sha256='6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64'; \ + sha256='c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le'; \ - sha256='e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le'; \ + sha256='4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64'; \ - sha256='1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64'; \ + sha256='575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x'; \ - sha256='5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5'; \ + url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x'; \ + sha256='cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index d20c0feea..5b7a12d78 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 +ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 20c5ec588..879dcd0b1 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9 +ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f5e223717..cc4d90ec5 100644 --- a/versions.json +++ b/versions.json @@ -355,61 +355,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "59c6b262bedc4a02f46c8400e830e660935684899c770c3f5e804a2b7079fc16", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-x86_64" + "sha256": "2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "97dac0aa10961ea30a79f6fe2c4a13bfe4da562926365a63042fcceb88d9d125", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv6" + "sha256": "69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d607ed69f5fe92ee1fd831cf764f977174c86192957a4de678c01db671c3dc52", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-armv7" + "sha256": "82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "6f00ed24a846046b441c0f0a0f8c1e00194f4b0e33f2433fac0d2dd0e486fc80", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-aarch64" + "sha256": "c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "90aac9e3dfd1ab57446347d6dc65ce2570d9d6165cf1b1f2185d1a6387746a45", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-x86_64" + "sha256": "f6bbd3739b93e625991414ec16a13d7be3e33321bcd618bf19634b92b6ee2a1e", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7443f0c51d9fcb8865a5ed4cf569c2db116b7d2a4762332ca06960ca3a622e72", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-darwin-aarch64" + "sha256": "620f5473f0c738b5f7f8409ca26aafca4572668c1ed9e628db5513df970459b4", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "e3afa6956f6cd4fdbaa8fe19781ae07a1bb8fb2f4d54a1aac857090d6fe1710d", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-ppc64le" + "sha256": "4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "1d080f5bc04b4b97c61ce3f57ff4a7bd11299f486bc287833f162360be201a7d", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-riscv64" + "sha256": "575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "5f302fb8e7d973b53f1f9dc808d2b1af08f94687cb14b3f26cc7b358854184b5", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-linux-s390x" + "sha256": "cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0a9a63442f50b494e8c5b6b1af9da138d9dbbeab094e3076747a709a470bb9e9", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-x86_64.exe" + "sha256": "d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "faf75b42e75980e8eb0b7d5f6abcffaed444a190d86ac0223c4ab4eb809b564c", - "url": "https://github.com/docker/compose/releases/download/v2.26.0/docker-compose-windows-aarch64.exe" + "sha256": "ba686e16da205b1f0fd16d75c1472cf4246823c5f7a8fed4300dffd069135ccf", + "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.26.0" + "version": "2.26.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 8114f468825cc3faa510e7c644ec96e721096f42 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 2 Apr 2024 09:39:52 -0700 Subject: [PATCH 318/667] Update "versions" curl invocation to be more defensive This allows the script to differentiate 404 from 503 so that we are less likely to accidentally commit downgrades for temporary failures. --- versions.sh | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/versions.sh b/versions.sh index 65999acb3..22388c060 100755 --- a/versions.sh +++ b/versions.sh @@ -23,8 +23,22 @@ else fi versions=( "${versions[@]%/}" ) +scriptPid="$$" # so we can kill the script even from a subshell +_curl() { + exec 42>&1 + local code + code="$(curl --silent --location -o /dev/fd/42 --write-out '%{http_code}' "$@")" + case "$code" in + 200) return 0 ;; + 404) return 1 ;; + esac + echo >&2 "error: unexpected status code $code while fetching: $*" + kill "$scriptPid" + exit 1 +} + dindLatest="$( - curl -fsSL -H 'Accept: application/json' 'https://github.com/docker/docker/commits/master/hack/dind.atom' \ + _curl -H 'Accept: application/json' 'https://github.com/docker/docker/commits/master/hack/dind.atom' \ | jq -r '.payload | first(.commitGroups[].commits[].oid)' )" @@ -75,7 +89,7 @@ buildxVersions="$( buildx= buildxVersion= for buildxVersion in $buildxVersions; do - if checksums="$(curl -fsSL "https://github.com/docker/buildx/releases/download/v${buildxVersion}/checksums.txt")"; then + if checksums="$(_curl "https://github.com/docker/buildx/releases/download/v${buildxVersion}/checksums.txt")"; then buildx="$(jq <<<"$checksums" -csR --arg version "$buildxVersion" ' rtrimstr("\n") | split("\n") | map( @@ -127,7 +141,7 @@ composeVersions="$( compose= composeVersion= for composeVersion in $composeVersions; do - if checksums="$(curl -fsSL "https://github.com/docker/compose/releases/download/v${composeVersion}/checksums.txt")"; then + if checksums="$(_curl "https://github.com/docker/compose/releases/download/v${composeVersion}/checksums.txt")"; then compose="$(jq <<<"$checksums" -csR --arg version "$composeVersion" ' rtrimstr("\n") | split("\n") | map( @@ -223,7 +237,7 @@ for version in "${versions[@]}"; do windows-*) url="https://download.docker.com/win/static/$channel/$arch/docker-$fullVersion.zip"; windows=1 ;; *) url="https://download.docker.com/linux/static/$channel/$arch/docker-$fullVersion.tgz"; windows= ;; esac - if wget --quiet --spider "$url" &> /dev/null; then + if _curl --head "$url" > /dev/null; then export bashbrewArch url doc="$( jq <<<"$doc" -c '.arches[env.bashbrewArch] = { @@ -245,7 +259,7 @@ for version in "${versions[@]}"; do case "$bashbrewArch" in amd64 | arm64v8) rootlessExtrasUrl="https://download.docker.com/linux/static/$channel/$arch/docker-rootless-extras-$fullVersion.tgz" - if wget --quiet --spider "$rootlessExtrasUrl" &> /dev/null; then + if _curl --head "$rootlessExtrasUrl" > /dev/null; then export rootlessExtrasUrl doc="$(jq <<<"$doc" -c ' .arches[env.bashbrewArch].rootlessExtrasUrl = env.rootlessExtrasUrl From b1589f6cf9a16dc36739c9569d60aad554966116 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 11 Apr 2024 10:04:36 -0700 Subject: [PATCH 319/667] Update 26 to 26.0.1 --- 26/cli/Dockerfile | 10 +++++----- 26/dind-rootless/Dockerfile | 4 ++-- 26/dind/Dockerfile | 8 ++++---- 26/windows/windowsservercore-1809/Dockerfile | 4 ++-- 26/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index d20a1317d..c0f76c008 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 26.0.0 +ENV DOCKER_VERSION 26.0.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind-rootless/Dockerfile b/26/dind-rootless/Dockerfile index f8164367d..170c855cb 100644 --- a/26/dind-rootless/Dockerfile +++ b/26/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-26.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind/Dockerfile b/26/dind/Dockerfile index 8fc51425e..3ccf48f7d 100644 --- a/26/dind/Dockerfile +++ b/26/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 5b7a12d78..507cdb8ec 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/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 26.0.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.0.zip +ENV DOCKER_VERSION 26.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.1.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/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 879dcd0b1..7164cf644 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/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 26.0.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.0.zip +ENV DOCKER_VERSION 26.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.1.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/versions.json b/versions.json index cc4d90ec5..2fff73760 100644 --- a/versions.json +++ b/versions.json @@ -284,21 +284,21 @@ "26": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.0.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.0.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.0.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.0.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.0.1.zip" } }, "buildx": { @@ -419,7 +419,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "26.0.0" + "version": "26.0.1" }, "26-rc": null } From befce9afb6febf3960773773f48ddadcb6f64b17 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Apr 2024 10:04:16 -0700 Subject: [PATCH 320/667] Update 24 to buildx 0.14.0 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 922e858f7..ff6b7e6f6 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.13.1 +ENV DOCKER_BUILDX_VERSION 0.14.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64'; \ - sha256='3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64'; \ + sha256='32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6'; \ - sha256='643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6'; \ + sha256='7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7'; \ - sha256='8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7'; \ + sha256='53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64'; \ - sha256='3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64'; \ + sha256='38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le'; \ - sha256='1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le'; \ + sha256='847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64'; \ - sha256='202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64'; \ + sha256='c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x'; \ - sha256='71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x'; \ + sha256='6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index e76e2c58d..5050578e6 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 +ENV DOCKER_BUILDX_VERSION 0.14.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 56421d3c2..b032f3476 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 +ENV DOCKER_BUILDX_VERSION 0.14.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 2fff73760..457488977 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.13.1.linux-amd64", - "sha256": "3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64" + "file": "buildx-v0.14.0.linux-amd64", + "sha256": "32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.13.1.linux-arm-v6", - "sha256": "643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6" + "file": "buildx-v0.14.0.linux-arm-v6", + "sha256": "7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.13.1.linux-arm-v7", - "sha256": "8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7" + "file": "buildx-v0.14.0.linux-arm-v7", + "sha256": "53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.13.1.linux-arm64", - "sha256": "3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64" + "file": "buildx-v0.14.0.linux-arm64", + "sha256": "38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.13.1.linux-ppc64le", - "sha256": "1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le" + "file": "buildx-v0.14.0.linux-ppc64le", + "sha256": "847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.13.1.linux-riscv64", - "sha256": "202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64" + "file": "buildx-v0.14.0.linux-riscv64", + "sha256": "c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.13.1.linux-s390x", - "sha256": "71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x" + "file": "buildx-v0.14.0.linux-s390x", + "sha256": "6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.13.1.windows-amd64.exe", - "sha256": "6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe" + "file": "buildx-v0.14.0.windows-amd64.exe", + "sha256": "d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.13.1.windows-arm64.exe", - "sha256": "3b6b93c1798dd6573fc63dac31f1f18ecfda4ee2ba78be147d5e8d090160b8d9", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.exe" + "file": "buildx-v0.14.0.windows-arm64.exe", + "sha256": "45999b08c6c50afcda184b29da797b35e5984abfb6547e075be6cf56321cf63f", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-arm64.exe" } }, - "version": "0.13.1" + "version": "0.14.0" }, "compose": { "arches": { From bbbb8ff0e12ba6d94ab58477015d03ef7066a11b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Apr 2024 10:05:48 -0700 Subject: [PATCH 321/667] Update 25 to buildx 0.14.0 --- 25/cli/Dockerfile | 30 +++++----- 25/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index ba6e0d0a7..3d5a33288 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.13.1 +ENV DOCKER_BUILDX_VERSION 0.14.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64'; \ - sha256='3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64'; \ + sha256='32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6'; \ - sha256='643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6'; \ + sha256='7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7'; \ - sha256='8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7'; \ + sha256='53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64'; \ - sha256='3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64'; \ + sha256='38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le'; \ - sha256='1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le'; \ + sha256='847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64'; \ - sha256='202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64'; \ + sha256='c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x'; \ - sha256='71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x'; \ + sha256='6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index d6d1f0d77..54f2204e4 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 +ENV DOCKER_BUILDX_VERSION 0.14.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 5ef6d5928..77eb217fe 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 +ENV DOCKER_BUILDX_VERSION 0.14.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 457488977..1f1ff7af5 100644 --- a/versions.json +++ b/versions.json @@ -163,52 +163,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.13.1.linux-amd64", - "sha256": "3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64" + "file": "buildx-v0.14.0.linux-amd64", + "sha256": "32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.13.1.linux-arm-v6", - "sha256": "643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6" + "file": "buildx-v0.14.0.linux-arm-v6", + "sha256": "7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.13.1.linux-arm-v7", - "sha256": "8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7" + "file": "buildx-v0.14.0.linux-arm-v7", + "sha256": "53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.13.1.linux-arm64", - "sha256": "3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64" + "file": "buildx-v0.14.0.linux-arm64", + "sha256": "38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.13.1.linux-ppc64le", - "sha256": "1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le" + "file": "buildx-v0.14.0.linux-ppc64le", + "sha256": "847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.13.1.linux-riscv64", - "sha256": "202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64" + "file": "buildx-v0.14.0.linux-riscv64", + "sha256": "c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.13.1.linux-s390x", - "sha256": "71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x" + "file": "buildx-v0.14.0.linux-s390x", + "sha256": "6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.13.1.windows-amd64.exe", - "sha256": "6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe" + "file": "buildx-v0.14.0.windows-amd64.exe", + "sha256": "d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.13.1.windows-arm64.exe", - "sha256": "3b6b93c1798dd6573fc63dac31f1f18ecfda4ee2ba78be147d5e8d090160b8d9", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.exe" + "file": "buildx-v0.14.0.windows-arm64.exe", + "sha256": "45999b08c6c50afcda184b29da797b35e5984abfb6547e075be6cf56321cf63f", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-arm64.exe" } }, - "version": "0.13.1" + "version": "0.14.0" }, "compose": { "arches": { From e69134b1fa842f024e77498abb05640bfdb8f2f1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Apr 2024 10:07:25 -0700 Subject: [PATCH 322/667] Update 26 to buildx 0.14.0 --- 26/cli/Dockerfile | 30 +++++----- 26/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index c0f76c008..2c4824115 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.13.1 +ENV DOCKER_BUILDX_VERSION 0.14.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64'; \ - sha256='3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64'; \ + sha256='32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6'; \ - sha256='643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6'; \ + sha256='7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7'; \ - sha256='8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7'; \ + sha256='53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64'; \ - sha256='3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64'; \ + sha256='38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le'; \ - sha256='1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le'; \ + sha256='847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64'; \ - sha256='202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64'; \ + sha256='c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x'; \ - sha256='71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x'; \ + sha256='6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 507cdb8ec..c364cdda1 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 +ENV DOCKER_BUILDX_VERSION 0.14.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 7164cf644..b2384bca8 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.13.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75 +ENV DOCKER_BUILDX_VERSION 0.14.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 1f1ff7af5..bc774c7e8 100644 --- a/versions.json +++ b/versions.json @@ -304,52 +304,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.13.1.linux-amd64", - "sha256": "3e2bc8ed25a9125d6aeec07df4e0211edea6288e075b524160ef3fd305d3d74c", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64" + "file": "buildx-v0.14.0.linux-amd64", + "sha256": "32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.13.1.linux-arm-v6", - "sha256": "643063c656098e312533fe5ee3411523fa06cc3926bd2e96b4c6239b9cecbf88", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6" + "file": "buildx-v0.14.0.linux-arm-v6", + "sha256": "7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.13.1.linux-arm-v7", - "sha256": "8d42e7823237e777b121070fda6ad68159539aa6597aedfa7630384643ad6f9a", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7" + "file": "buildx-v0.14.0.linux-arm-v7", + "sha256": "53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.13.1.linux-arm64", - "sha256": "3ba35a5d38361a64b62aeb9d20acc835ff6862a711cb438e610026b29c0ac489", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64" + "file": "buildx-v0.14.0.linux-arm64", + "sha256": "38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.13.1.linux-ppc64le", - "sha256": "1d16f7b15706d98523889a1ca50e9dfc44bbaec1f736d883a0528805795b9de2", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le" + "file": "buildx-v0.14.0.linux-ppc64le", + "sha256": "847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.13.1.linux-riscv64", - "sha256": "202221c9b7fb881d092986e8ec2497ee71729f17c4afd912384a086af700e1ad", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64" + "file": "buildx-v0.14.0.linux-riscv64", + "sha256": "c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.13.1.linux-s390x", - "sha256": "71d7c39192b1b07790eb71e46742cc69a559f3eb00a1512f4a8d2ea1067408da", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x" + "file": "buildx-v0.14.0.linux-s390x", + "sha256": "6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.13.1.windows-amd64.exe", - "sha256": "6b113e84cbc3cd645646aa82f00a7f7d3737cc10375b4341e0aca0de0c997c75", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe" + "file": "buildx-v0.14.0.windows-amd64.exe", + "sha256": "d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.13.1.windows-arm64.exe", - "sha256": "3b6b93c1798dd6573fc63dac31f1f18ecfda4ee2ba78be147d5e8d090160b8d9", - "url": "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.exe" + "file": "buildx-v0.14.0.windows-arm64.exe", + "sha256": "45999b08c6c50afcda184b29da797b35e5984abfb6547e075be6cf56321cf63f", + "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-arm64.exe" } }, - "version": "0.13.1" + "version": "0.14.0" }, "compose": { "arches": { From e73d98fe46a0a7b99be6ce69cc6406ff5a7d94a0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Apr 2024 14:40:47 -0700 Subject: [PATCH 323/667] Update 26 to 26.0.2 --- 26/cli/Dockerfile | 10 +++++----- 26/dind-rootless/Dockerfile | 4 ++-- 26/dind/Dockerfile | 8 ++++---- 26/windows/windowsservercore-1809/Dockerfile | 4 ++-- 26/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 2c4824115..40b80925d 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 26.0.1 +ENV DOCKER_VERSION 26.0.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind-rootless/Dockerfile b/26/dind-rootless/Dockerfile index 170c855cb..8d8a10b42 100644 --- a/26/dind-rootless/Dockerfile +++ b/26/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-26.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind/Dockerfile b/26/dind/Dockerfile index 3ccf48f7d..11a531e63 100644 --- a/26/dind/Dockerfile +++ b/26/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index c364cdda1..f10b7ba50 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/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 26.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.1.zip +ENV DOCKER_VERSION 26.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.2.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/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index b2384bca8..8d970bb56 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/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 26.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.1.zip +ENV DOCKER_VERSION 26.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.2.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/versions.json b/versions.json index bc774c7e8..dd9c14794 100644 --- a/versions.json +++ b/versions.json @@ -284,21 +284,21 @@ "26": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.0.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.0.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.0.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.0.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.0.2.zip" } }, "buildx": { @@ -419,7 +419,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "26.0.1" + "version": "26.0.2" }, "26-rc": null } From 9b4db7b1b1edb202cf2a8046174d835a4cec70e0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 22 Apr 2024 14:49:05 -0700 Subject: [PATCH 324/667] Update 26 to 26.1.0 --- 26/cli/Dockerfile | 10 +++++----- 26/dind-rootless/Dockerfile | 4 ++-- 26/dind/Dockerfile | 8 ++++---- 26/windows/windowsservercore-1809/Dockerfile | 4 ++-- 26/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 40b80925d..415c984d9 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 26.0.2 +ENV DOCKER_VERSION 26.1.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.1.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind-rootless/Dockerfile b/26/dind-rootless/Dockerfile index 8d8a10b42..e162e20aa 100644 --- a/26/dind-rootless/Dockerfile +++ b/26/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-26.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind/Dockerfile b/26/dind/Dockerfile index 11a531e63..90365a193 100644 --- a/26/dind/Dockerfile +++ b/26/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.1.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index f10b7ba50..d0fcb1b46 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/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 26.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.2.zip +ENV DOCKER_VERSION 26.1.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.0.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/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 8d970bb56..8730a3ee9 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/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 26.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.2.zip +ENV DOCKER_VERSION 26.1.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.0.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/versions.json b/versions.json index dd9c14794..f25979fe6 100644 --- a/versions.json +++ b/versions.json @@ -284,21 +284,21 @@ "26": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.1.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.1.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.1.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.1.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.0.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.1.0.zip" } }, "buildx": { @@ -419,7 +419,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "26.0.2" + "version": "26.1.0" }, "26-rc": null } From 0b3297dc11a73256792447608e75af81a2cbe95e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Apr 2024 16:04:48 -0700 Subject: [PATCH 325/667] Update 24 to compose 2.27.0 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index ff6b7e6f6..fd6ae3765 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_VERSION 2.27.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64'; \ - sha256='2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64'; \ + sha256='f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6'; \ - sha256='69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6'; \ + sha256='ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7'; \ - sha256='82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7'; \ + sha256='8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64'; \ - sha256='c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64'; \ + sha256='37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le'; \ - sha256='4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le'; \ + sha256='faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64'; \ - sha256='575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64'; \ + sha256='71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x'; \ - sha256='cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x'; \ + sha256='d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 5050578e6..3dbd2fb10 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 +ENV DOCKER_COMPOSE_VERSION 2.27.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index b032f3476..73028d7a3 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 +ENV DOCKER_COMPOSE_VERSION 2.27.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f25979fe6..59d0d16d8 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64" + "sha256": "f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6" + "sha256": "ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7" + "sha256": "8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64" + "sha256": "37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "f6bbd3739b93e625991414ec16a13d7be3e33321bcd618bf19634b92b6ee2a1e", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-x86_64" + "sha256": "c4affd2981e5a91c34076f8e1231be79f9c96d82397874db5a4f72a5398585c0", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "620f5473f0c738b5f7f8409ca26aafca4572668c1ed9e628db5513df970459b4", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-aarch64" + "sha256": "83c6527089f438599f82e9ea97f60af206d241159df8c12a408f4a459d9ddae3", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le" + "sha256": "faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64" + "sha256": "71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x" + "sha256": "d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe" + "sha256": "2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "ba686e16da205b1f0fd16d75c1472cf4246823c5f7a8fed4300dffd069135ccf", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-aarch64.exe" + "sha256": "42c9cc5efeed4466a1f935bb01e4b9cb25507272f374b21d9618594c201aaa0e", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.26.1" + "version": "2.27.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 96b05bda808bce322f08b0aa0005d43810134fdc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Apr 2024 16:11:57 -0700 Subject: [PATCH 326/667] Update 25 to compose 2.27.0 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 3d5a33288..80e6f2f48 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_VERSION 2.27.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64'; \ - sha256='2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64'; \ + sha256='f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6'; \ - sha256='69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6'; \ + sha256='ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7'; \ - sha256='82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7'; \ + sha256='8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64'; \ - sha256='c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64'; \ + sha256='37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le'; \ - sha256='4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le'; \ + sha256='faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64'; \ - sha256='575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64'; \ + sha256='71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x'; \ - sha256='cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x'; \ + sha256='d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 54f2204e4..53fb2198e 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 +ENV DOCKER_COMPOSE_VERSION 2.27.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 77eb217fe..b24a4fdfc 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 +ENV DOCKER_COMPOSE_VERSION 2.27.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 59d0d16d8..1234e36f1 100644 --- a/versions.json +++ b/versions.json @@ -214,61 +214,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64" + "sha256": "f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6" + "sha256": "ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7" + "sha256": "8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64" + "sha256": "37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "f6bbd3739b93e625991414ec16a13d7be3e33321bcd618bf19634b92b6ee2a1e", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-x86_64" + "sha256": "c4affd2981e5a91c34076f8e1231be79f9c96d82397874db5a4f72a5398585c0", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "620f5473f0c738b5f7f8409ca26aafca4572668c1ed9e628db5513df970459b4", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-aarch64" + "sha256": "83c6527089f438599f82e9ea97f60af206d241159df8c12a408f4a459d9ddae3", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le" + "sha256": "faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64" + "sha256": "71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x" + "sha256": "d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe" + "sha256": "2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "ba686e16da205b1f0fd16d75c1472cf4246823c5f7a8fed4300dffd069135ccf", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-aarch64.exe" + "sha256": "42c9cc5efeed4466a1f935bb01e4b9cb25507272f374b21d9618594c201aaa0e", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.26.1" + "version": "2.27.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 3d79c81ed4b744ca54997c8d2bc17fe62f4460de Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 24 Apr 2024 16:17:38 -0700 Subject: [PATCH 327/667] Update 26 to compose 2.27.0 --- 26/cli/Dockerfile | 30 ++++++------ 26/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 415c984d9..3fbc8d058 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.26.1 +ENV DOCKER_COMPOSE_VERSION 2.27.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64'; \ - sha256='2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64'; \ + sha256='f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6'; \ - sha256='69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6'; \ + sha256='ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7'; \ - sha256='82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7'; \ + sha256='8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64'; \ - sha256='c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64'; \ + sha256='37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le'; \ - sha256='4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le'; \ + sha256='faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64'; \ - sha256='575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64'; \ + sha256='71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x'; \ - sha256='cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9'; \ + url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x'; \ + sha256='d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index d0fcb1b46..a44735942 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 +ENV DOCKER_COMPOSE_VERSION 2.27.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 8730a3ee9..7b3b33f44 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.26.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125 +ENV DOCKER_COMPOSE_VERSION 2.27.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 1234e36f1..a2bf6f61e 100644 --- a/versions.json +++ b/versions.json @@ -355,61 +355,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "2f61856d1b8c9de29ffdaedaa1c6d0a5fc5c79da45068f1f4310feed8d3a3f61", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-x86_64" + "sha256": "f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "69ce7a9753e53856b92bb75823893e116d993f92f1e389e0f1a4dae45f79296e", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv6" + "sha256": "ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "82138d1784ba968b59546d19acad85dbca7bbe67f6614ffb84ef4c3cd72f7a4a", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-armv7" + "sha256": "8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "c86efb0d6347b72af6690f06fbd30ed17023fe67e23e28647cacb4b3f6bfb451", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-aarch64" + "sha256": "37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "f6bbd3739b93e625991414ec16a13d7be3e33321bcd618bf19634b92b6ee2a1e", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-x86_64" + "sha256": "c4affd2981e5a91c34076f8e1231be79f9c96d82397874db5a4f72a5398585c0", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "620f5473f0c738b5f7f8409ca26aafca4572668c1ed9e628db5513df970459b4", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-darwin-aarch64" + "sha256": "83c6527089f438599f82e9ea97f60af206d241159df8c12a408f4a459d9ddae3", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4f4dfc8d6834edfd884d8d5326db0bae3a48f25fe31403684be07faea8822aed", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-ppc64le" + "sha256": "faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "575f13c8d567d38bf83fc0885163a505564517f013f01f2e5cd12d989cf88fee", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-riscv64" + "sha256": "71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "cbcced8480b8c2ed90c0eb3d4d6c45d6ce8ea0d590961b7ef303bd136c8e85c9", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-linux-s390x" + "sha256": "d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "d8a386d375ef26a77be0bee97516b0287d93acafb3976806f42e2b76c6904125", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-x86_64.exe" + "sha256": "2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "ba686e16da205b1f0fd16d75c1472cf4246823c5f7a8fed4300dffd069135ccf", - "url": "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-windows-aarch64.exe" + "sha256": "42c9cc5efeed4466a1f935bb01e4b9cb25507272f374b21d9618594c201aaa0e", + "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.26.1" + "version": "2.27.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From c37212dbf56a2e90926a46e83787144a687415f0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 30 Apr 2024 10:04:38 -0700 Subject: [PATCH 328/667] Update 26 to 26.1.1 --- 26/cli/Dockerfile | 10 +++++----- 26/dind-rootless/Dockerfile | 4 ++-- 26/dind/Dockerfile | 8 ++++---- 26/windows/windowsservercore-1809/Dockerfile | 4 ++-- 26/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 3fbc8d058..d8f0a6302 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 26.1.0 +ENV DOCKER_VERSION 26.1.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.1.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind-rootless/Dockerfile b/26/dind-rootless/Dockerfile index e162e20aa..01c2a0ff7 100644 --- a/26/dind-rootless/Dockerfile +++ b/26/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-26.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind/Dockerfile b/26/dind/Dockerfile index 90365a193..24ba0d1bf 100644 --- a/26/dind/Dockerfile +++ b/26/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.1.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index a44735942..ea0548fb5 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/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 26.1.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.0.zip +ENV DOCKER_VERSION 26.1.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.1.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/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 7b3b33f44..4c864a9ad 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/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 26.1.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.0.zip +ENV DOCKER_VERSION 26.1.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.1.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/versions.json b/versions.json index a2bf6f61e..be3cc5b16 100644 --- a/versions.json +++ b/versions.json @@ -284,21 +284,21 @@ "26": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.1.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.1.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.1.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.1.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.1.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.1.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.1.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.1.1.zip" } }, "buildx": { @@ -419,7 +419,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "26.1.0" + "version": "26.1.1" }, "26-rc": null } From 34afec84bf397392007934ffe12a27b92bd1e729 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 9 May 2024 04:04:38 -0700 Subject: [PATCH 329/667] Update 26 to 26.1.2 --- 26/cli/Dockerfile | 10 +++++----- 26/dind-rootless/Dockerfile | 4 ++-- 26/dind/Dockerfile | 8 ++++---- 26/windows/windowsservercore-1809/Dockerfile | 4 ++-- 26/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index d8f0a6302..ab7ac34ed 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 26.1.1 +ENV DOCKER_VERSION 26.1.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.1.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind-rootless/Dockerfile b/26/dind-rootless/Dockerfile index 01c2a0ff7..5b00ae0af 100644 --- a/26/dind-rootless/Dockerfile +++ b/26/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-26.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind/Dockerfile b/26/dind/Dockerfile index 24ba0d1bf..6988b2c5c 100644 --- a/26/dind/Dockerfile +++ b/26/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.1.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index ea0548fb5..10123e8bc 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/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 26.1.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.1.zip +ENV DOCKER_VERSION 26.1.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.2.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/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 4c864a9ad..96a964185 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/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 26.1.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.1.zip +ENV DOCKER_VERSION 26.1.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.2.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/versions.json b/versions.json index be3cc5b16..5c250f553 100644 --- a/versions.json +++ b/versions.json @@ -284,21 +284,21 @@ "26": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.1.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.1.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.1.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.1.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.1.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.1.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.1.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.1.2.zip" } }, "buildx": { @@ -419,7 +419,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "26.1.1" + "version": "26.1.2" }, "26-rc": null } From 087521eb6c8c162b4ea538a0861df40ef0114059 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 May 2024 09:36:41 -0700 Subject: [PATCH 330/667] Update 26 to 26.1.3 --- 26/cli/Dockerfile | 10 +++++----- 26/dind-rootless/Dockerfile | 4 ++-- 26/dind/Dockerfile | 8 ++++---- 26/windows/windowsservercore-1809/Dockerfile | 4 ++-- 26/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index ab7ac34ed..d6dd9ab8b 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 26.1.2 +ENV DOCKER_VERSION 26.1.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.1.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind-rootless/Dockerfile b/26/dind-rootless/Dockerfile index 5b00ae0af..b76730112 100644 --- a/26/dind-rootless/Dockerfile +++ b/26/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-26.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind/Dockerfile b/26/dind/Dockerfile index 6988b2c5c..ef0d53b87 100644 --- a/26/dind/Dockerfile +++ b/26/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.1.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 10123e8bc..134a3c888 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/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 26.1.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.2.zip +ENV DOCKER_VERSION 26.1.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.3.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/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 96a964185..b339812f4 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/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 26.1.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.2.zip +ENV DOCKER_VERSION 26.1.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.3.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/versions.json b/versions.json index 5c250f553..dfceb5415 100644 --- a/versions.json +++ b/versions.json @@ -284,21 +284,21 @@ "26": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.1.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.1.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.1.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.1.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.1.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.1.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.1.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.1.3.zip" } }, "buildx": { @@ -419,7 +419,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "26.1.2" + "version": "26.1.3" }, "26-rc": null } From 1b21e433dccaa4d0dfc84d53644fbdab14b210e1 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 22 May 2024 14:15:27 +0200 Subject: [PATCH 331/667] Update to Alpine 3.20 --- 24/cli/Dockerfile | 2 +- 25/cli/Dockerfile | 2 +- 26/cli/Dockerfile | 2 +- Dockerfile-cli.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index fd6ae3765..a18de9eac 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.20 RUN apk add --no-cache \ ca-certificates \ diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 80e6f2f48..cdcdf24de 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.20 RUN apk add --no-cache \ ca-certificates \ diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index d6dd9ab8b..b9eb5243d 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.20 RUN apk add --no-cache \ ca-certificates \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 83622f12b..0e6e131cd 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -1,5 +1,5 @@ {{ include "shared" -}} -FROM alpine:3.19 +FROM alpine:3.20 RUN apk add --no-cache \ ca-certificates \ From c63a44923c911b8fb85dae8f024eda1163cb1ffb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 May 2024 12:06:37 -0700 Subject: [PATCH 332/667] Update 24 to buildx 0.14.1 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index a18de9eac..f90b3fac3 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.14.0 +ENV DOCKER_BUILDX_VERSION 0.14.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64'; \ - sha256='32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64'; \ + sha256='68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6'; \ - sha256='7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6'; \ + sha256='afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7'; \ - sha256='53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7'; \ + sha256='32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64'; \ - sha256='38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64'; \ + sha256='82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le'; \ - sha256='847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le'; \ + sha256='64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64'; \ - sha256='c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64'; \ + sha256='32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x'; \ - sha256='6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x'; \ + sha256='c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 3dbd2fb10..18ec80749 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 +ENV DOCKER_BUILDX_VERSION 0.14.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 73028d7a3..be5b8c3fb 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 +ENV DOCKER_BUILDX_VERSION 0.14.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index dfceb5415..cbee8ac22 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.14.0.linux-amd64", - "sha256": "32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64" + "file": "buildx-v0.14.1.linux-amd64", + "sha256": "68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.14.0.linux-arm-v6", - "sha256": "7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6" + "file": "buildx-v0.14.1.linux-arm-v6", + "sha256": "afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.14.0.linux-arm-v7", - "sha256": "53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7" + "file": "buildx-v0.14.1.linux-arm-v7", + "sha256": "32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.14.0.linux-arm64", - "sha256": "38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64" + "file": "buildx-v0.14.1.linux-arm64", + "sha256": "82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.14.0.linux-ppc64le", - "sha256": "847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le" + "file": "buildx-v0.14.1.linux-ppc64le", + "sha256": "64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.14.0.linux-riscv64", - "sha256": "c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64" + "file": "buildx-v0.14.1.linux-riscv64", + "sha256": "32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.14.0.linux-s390x", - "sha256": "6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x" + "file": "buildx-v0.14.1.linux-s390x", + "sha256": "c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.14.0.windows-amd64.exe", - "sha256": "d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe" + "file": "buildx-v0.14.1.windows-amd64.exe", + "sha256": "21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.14.0.windows-arm64.exe", - "sha256": "45999b08c6c50afcda184b29da797b35e5984abfb6547e075be6cf56321cf63f", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-arm64.exe" + "file": "buildx-v0.14.1.windows-arm64.exe", + "sha256": "309e6722ab7dcb236cd6844493ab5787924dd7ee83055cd46ea982e37ca273f5", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-arm64.exe" } }, - "version": "0.14.0" + "version": "0.14.1" }, "compose": { "arches": { From 9779cb5c595169f0ca71ed608b47db1f493bf36e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 May 2024 12:08:19 -0700 Subject: [PATCH 333/667] Update 25 to buildx 0.14.1 --- 25/cli/Dockerfile | 30 +++++----- 25/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index cdcdf24de..3f73ce3d9 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.14.0 +ENV DOCKER_BUILDX_VERSION 0.14.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64'; \ - sha256='32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64'; \ + sha256='68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6'; \ - sha256='7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6'; \ + sha256='afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7'; \ - sha256='53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7'; \ + sha256='32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64'; \ - sha256='38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64'; \ + sha256='82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le'; \ - sha256='847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le'; \ + sha256='64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64'; \ - sha256='c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64'; \ + sha256='32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x'; \ - sha256='6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x'; \ + sha256='c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 53fb2198e..93f802702 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 +ENV DOCKER_BUILDX_VERSION 0.14.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index b24a4fdfc..caac23979 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 +ENV DOCKER_BUILDX_VERSION 0.14.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index cbee8ac22..958fd16a0 100644 --- a/versions.json +++ b/versions.json @@ -163,52 +163,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.14.0.linux-amd64", - "sha256": "32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64" + "file": "buildx-v0.14.1.linux-amd64", + "sha256": "68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.14.0.linux-arm-v6", - "sha256": "7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6" + "file": "buildx-v0.14.1.linux-arm-v6", + "sha256": "afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.14.0.linux-arm-v7", - "sha256": "53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7" + "file": "buildx-v0.14.1.linux-arm-v7", + "sha256": "32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.14.0.linux-arm64", - "sha256": "38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64" + "file": "buildx-v0.14.1.linux-arm64", + "sha256": "82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.14.0.linux-ppc64le", - "sha256": "847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le" + "file": "buildx-v0.14.1.linux-ppc64le", + "sha256": "64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.14.0.linux-riscv64", - "sha256": "c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64" + "file": "buildx-v0.14.1.linux-riscv64", + "sha256": "32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.14.0.linux-s390x", - "sha256": "6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x" + "file": "buildx-v0.14.1.linux-s390x", + "sha256": "c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.14.0.windows-amd64.exe", - "sha256": "d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe" + "file": "buildx-v0.14.1.windows-amd64.exe", + "sha256": "21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.14.0.windows-arm64.exe", - "sha256": "45999b08c6c50afcda184b29da797b35e5984abfb6547e075be6cf56321cf63f", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-arm64.exe" + "file": "buildx-v0.14.1.windows-arm64.exe", + "sha256": "309e6722ab7dcb236cd6844493ab5787924dd7ee83055cd46ea982e37ca273f5", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-arm64.exe" } }, - "version": "0.14.0" + "version": "0.14.1" }, "compose": { "arches": { From c9c757a745bf09699b87541ff6779676926a5b69 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 May 2024 12:09:49 -0700 Subject: [PATCH 334/667] Update 26 to buildx 0.14.1 --- 26/cli/Dockerfile | 30 +++++----- 26/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index b9eb5243d..818a8f462 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.14.0 +ENV DOCKER_BUILDX_VERSION 0.14.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64'; \ - sha256='32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64'; \ + sha256='68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6'; \ - sha256='7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6'; \ + sha256='afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7'; \ - sha256='53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7'; \ + sha256='32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64'; \ - sha256='38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64'; \ + sha256='82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le'; \ - sha256='847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le'; \ + sha256='64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64'; \ - sha256='c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64'; \ + sha256='32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x'; \ - sha256='6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d'; \ + url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x'; \ + sha256='c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 134a3c888..66fa05413 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 +ENV DOCKER_BUILDX_VERSION 0.14.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index b339812f4..d7f3cddd8 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8 +ENV DOCKER_BUILDX_VERSION 0.14.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 958fd16a0..b1677b77e 100644 --- a/versions.json +++ b/versions.json @@ -304,52 +304,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.14.0.linux-amd64", - "sha256": "32f8f17eca35bf2efe6c0e47f40e4692a876f34531b421efc984799a5b41226e", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-amd64" + "file": "buildx-v0.14.1.linux-amd64", + "sha256": "68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.14.0.linux-arm-v6", - "sha256": "7a23989eb26ad27e1b7c11a38dda6a8e6a94562969c19165cf8f49e70203ad20", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v6" + "file": "buildx-v0.14.1.linux-arm-v6", + "sha256": "afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.14.0.linux-arm-v7", - "sha256": "53b2d827510c6cff41503454caeb0d6613d5ed11201ba10f5ad6c22466cc178c", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm-v7" + "file": "buildx-v0.14.1.linux-arm-v7", + "sha256": "32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.14.0.linux-arm64", - "sha256": "38bf0ea9c48743edb8243f14272be65a2bad7092228068337aea584309ea664c", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-arm64" + "file": "buildx-v0.14.1.linux-arm64", + "sha256": "82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.14.0.linux-ppc64le", - "sha256": "847e665e8f1fef3b85c6a5139d9bc57a81bae84d6a882d3ed71e2b5e2bd94bf6", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-ppc64le" + "file": "buildx-v0.14.1.linux-ppc64le", + "sha256": "64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.14.0.linux-riscv64", - "sha256": "c853c01f71b6b778b430d985813069d1ca4f2b2e7e039723298350839a556d2b", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-riscv64" + "file": "buildx-v0.14.1.linux-riscv64", + "sha256": "32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.14.0.linux-s390x", - "sha256": "6ed2520cf5b7b4b1a985622c61b62d8f65634634b0ef8b3d0594dc1550032d9d", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.linux-s390x" + "file": "buildx-v0.14.1.linux-s390x", + "sha256": "c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.14.0.windows-amd64.exe", - "sha256": "d43f5008431fb4ffd438d14ea686ed0f9c7ef101f2dfd1f84a5670979aeb39a8", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-amd64.exe" + "file": "buildx-v0.14.1.windows-amd64.exe", + "sha256": "21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.14.0.windows-arm64.exe", - "sha256": "45999b08c6c50afcda184b29da797b35e5984abfb6547e075be6cf56321cf63f", - "url": "https://github.com/docker/buildx/releases/download/v0.14.0/buildx-v0.14.0.windows-arm64.exe" + "file": "buildx-v0.14.1.windows-arm64.exe", + "sha256": "309e6722ab7dcb236cd6844493ab5787924dd7ee83055cd46ea982e37ca273f5", + "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-arm64.exe" } }, - "version": "0.14.0" + "version": "0.14.1" }, "compose": { "arches": { From 357294b08515ffb3fed79339bbe095cfe723c4ee Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 24 May 2024 10:04:15 -0700 Subject: [PATCH 335/667] Update 24 to compose 2.27.1 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index f90b3fac3..d8a2d018c 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.27.0 +ENV DOCKER_COMPOSE_VERSION 2.27.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64'; \ - sha256='f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64'; \ + sha256='ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6'; \ - sha256='ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6'; \ + sha256='5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7'; \ - sha256='8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7'; \ + sha256='9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64'; \ - sha256='37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64'; \ + sha256='16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le'; \ - sha256='faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le'; \ + sha256='f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64'; \ - sha256='71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64'; \ + sha256='9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x'; \ - sha256='d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x'; \ + sha256='6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 18ec80749..2fa4df9e7 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac +ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index be5b8c3fb..ef1f127ed 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac +ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b1677b77e..5c1bff43b 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64" + "sha256": "ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6" + "sha256": "5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7" + "sha256": "9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64" + "sha256": "16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c4affd2981e5a91c34076f8e1231be79f9c96d82397874db5a4f72a5398585c0", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-x86_64" + "sha256": "a6217853736f8936fedd3d20736e056b7416a8ef653f49d914504c3715855034", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "83c6527089f438599f82e9ea97f60af206d241159df8c12a408f4a459d9ddae3", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-aarch64" + "sha256": "17feecc6038b7c95b64e3cd02bded53eec47f17cf4a54146ecaef70af3ca56c6", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le" + "sha256": "f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64" + "sha256": "9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x" + "sha256": "6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe" + "sha256": "354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "42c9cc5efeed4466a1f935bb01e4b9cb25507272f374b21d9618594c201aaa0e", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-aarch64.exe" + "sha256": "8ea87a0ea654035b1b46d8f5121a99d712958addda6626b0185ab713f24a0ed9", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.27.0" + "version": "2.27.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 6f200b90d58f9ffba42268df0e37bf0f14892765 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 24 May 2024 10:05:44 -0700 Subject: [PATCH 336/667] Update 25 to compose 2.27.1 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 3f73ce3d9..8cc9028f0 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.27.0 +ENV DOCKER_COMPOSE_VERSION 2.27.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64'; \ - sha256='f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64'; \ + sha256='ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6'; \ - sha256='ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6'; \ + sha256='5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7'; \ - sha256='8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7'; \ + sha256='9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64'; \ - sha256='37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64'; \ + sha256='16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le'; \ - sha256='faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le'; \ + sha256='f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64'; \ - sha256='71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64'; \ + sha256='9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x'; \ - sha256='d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x'; \ + sha256='6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 93f802702..3a10309ed 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac +ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index caac23979..c4e6971ad 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac +ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 5c1bff43b..ade31656b 100644 --- a/versions.json +++ b/versions.json @@ -214,61 +214,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64" + "sha256": "ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6" + "sha256": "5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7" + "sha256": "9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64" + "sha256": "16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c4affd2981e5a91c34076f8e1231be79f9c96d82397874db5a4f72a5398585c0", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-x86_64" + "sha256": "a6217853736f8936fedd3d20736e056b7416a8ef653f49d914504c3715855034", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "83c6527089f438599f82e9ea97f60af206d241159df8c12a408f4a459d9ddae3", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-aarch64" + "sha256": "17feecc6038b7c95b64e3cd02bded53eec47f17cf4a54146ecaef70af3ca56c6", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le" + "sha256": "f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64" + "sha256": "9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x" + "sha256": "6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe" + "sha256": "354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "42c9cc5efeed4466a1f935bb01e4b9cb25507272f374b21d9618594c201aaa0e", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-aarch64.exe" + "sha256": "8ea87a0ea654035b1b46d8f5121a99d712958addda6626b0185ab713f24a0ed9", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.27.0" + "version": "2.27.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 234c02c685a0b966e6aae965924a70f29b216fe1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 24 May 2024 10:07:11 -0700 Subject: [PATCH 337/667] Update 26 to compose 2.27.1 --- 26/cli/Dockerfile | 30 ++++++------ 26/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 818a8f462..465de8774 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.27.0 +ENV DOCKER_COMPOSE_VERSION 2.27.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64'; \ - sha256='f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64'; \ + sha256='ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6'; \ - sha256='ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6'; \ + sha256='5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7'; \ - sha256='8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7'; \ + sha256='9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64'; \ - sha256='37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64'; \ + sha256='16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le'; \ - sha256='faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le'; \ + sha256='f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64'; \ - sha256='71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64'; \ + sha256='9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x'; \ - sha256='d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d'; \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x'; \ + sha256='6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 66fa05413..0261af03d 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac +ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index d7f3cddd8..df56dcecd 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac +ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ade31656b..4889e6b38 100644 --- a/versions.json +++ b/versions.json @@ -355,61 +355,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "f3ba3bf1e4ab18e96c2d36526a075a02a78fb5f8e80d3e3ca9c5bf256d81d0a0", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-x86_64" + "sha256": "ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "ee467093d138f9c4d189b774552ef86ba253107bd91226b28f0c54edf62fe949", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv6" + "sha256": "5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "8461b4d4a58eaaf04c4f482f0dabe57db9ef63229311a9583c6548b417f33c76", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-armv7" + "sha256": "9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "37a1c197fef5fda2a3df2d5ae0d7762ad2a00e30946ad06d4ad9fa8cef16d9e7", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-aarch64" + "sha256": "16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c4affd2981e5a91c34076f8e1231be79f9c96d82397874db5a4f72a5398585c0", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-x86_64" + "sha256": "a6217853736f8936fedd3d20736e056b7416a8ef653f49d914504c3715855034", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "83c6527089f438599f82e9ea97f60af206d241159df8c12a408f4a459d9ddae3", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-darwin-aarch64" + "sha256": "17feecc6038b7c95b64e3cd02bded53eec47f17cf4a54146ecaef70af3ca56c6", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "faed2dd8f0568922dadf1a8fa155898d5be1feaa67568f2aa730a594ba6a44ec", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-ppc64le" + "sha256": "f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "71a09bd1980505a5f194cfab5df53bba55e493edf246f3ebb28cbfef8caf7715", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-riscv64" + "sha256": "9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "d38522261b481d7f20da7f80af67824afe2a1b54dd19215690febb0c49ad932d", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-linux-s390x" + "sha256": "6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "2e5ae01bbec3bd6ed3a5a267df7edee3c8c5fc59101a0aad0241ed4ed46c70ac", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-x86_64.exe" + "sha256": "354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "42c9cc5efeed4466a1f935bb01e4b9cb25507272f374b21d9618594c201aaa0e", - "url": "https://github.com/docker/compose/releases/download/v2.27.0/docker-compose-windows-aarch64.exe" + "sha256": "8ea87a0ea654035b1b46d8f5121a99d712958addda6626b0185ab713f24a0ed9", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.27.0" + "version": "2.27.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 9bfad19b46a40c8fd08db13ca1ad3c2d36335b16 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 29 May 2024 16:13:20 -0700 Subject: [PATCH 338/667] Add `riscv64` mapping so we're automatically ready if binaries show up --- versions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.sh b/versions.sh index 22388c060..04cb48f57 100755 --- a/versions.sh +++ b/versions.sh @@ -8,6 +8,7 @@ declare -A dockerArches=( ['arm32v7']='armhf' ['arm64v8']='aarch64' ['ppc64le']='ppc64le' + ['riscv64']='riscv64' ['s390x']='s390x' ['windows-amd64']='x86_64' ) From 6ce7fe78a5a66dadf37e9226d8485e94e894814f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 5 Jun 2024 11:50:46 -0700 Subject: [PATCH 339/667] Update 26 to 26.1.4 --- 26/cli/Dockerfile | 10 +++++----- 26/dind-rootless/Dockerfile | 4 ++-- 26/dind/Dockerfile | 8 ++++---- 26/windows/windowsservercore-1809/Dockerfile | 4 ++-- 26/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 465de8774..c5489ebd9 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 26.1.3 +ENV DOCKER_VERSION 26.1.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.1.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind-rootless/Dockerfile b/26/dind-rootless/Dockerfile index b76730112..d176fdbae 100644 --- a/26/dind-rootless/Dockerfile +++ b/26/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-26.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/dind/Dockerfile b/26/dind/Dockerfile index ef0d53b87..7698d1ecc 100644 --- a/26/dind/Dockerfile +++ b/26/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-26.1.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 0261af03d..dde776bd8 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/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 26.1.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.3.zip +ENV DOCKER_VERSION 26.1.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.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/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index df56dcecd..8133de2b5 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/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 26.1.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.3.zip +ENV DOCKER_VERSION 26.1.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.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/versions.json b/versions.json index 4889e6b38..b37ae200e 100644 --- a/versions.json +++ b/versions.json @@ -284,21 +284,21 @@ "26": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.1.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.1.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.4.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.1.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.1.4.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.1.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.1.4.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.1.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.1.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.4.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.1.3.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.1.4.zip" } }, "buildx": { @@ -419,7 +419,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "26.1.3" + "version": "26.1.4" }, "26-rc": null } From a93887ee0c0da8dec8c7c292727464cf1a30f92c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 11 Jun 2024 16:04:14 -0700 Subject: [PATCH 340/667] Update 24 to buildx 0.15.0 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index d8a2d018c..bca2a8cad 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.14.1 +ENV DOCKER_BUILDX_VERSION 0.15.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64'; \ - sha256='68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64'; \ + sha256='6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6'; \ - sha256='afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6'; \ + sha256='78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7'; \ - sha256='32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7'; \ + sha256='e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64'; \ - sha256='82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64'; \ + sha256='ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le'; \ - sha256='64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le'; \ + sha256='3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64'; \ - sha256='32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64'; \ + sha256='6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x'; \ - sha256='c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x'; \ + sha256='3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 2fa4df9e7..01e150166 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 +ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index ef1f127ed..8568226c5 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 +ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b37ae200e..4ef0f73c1 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.14.1.linux-amd64", - "sha256": "68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64" + "file": "buildx-v0.15.0.linux-amd64", + "sha256": "6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.14.1.linux-arm-v6", - "sha256": "afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6" + "file": "buildx-v0.15.0.linux-arm-v6", + "sha256": "78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.14.1.linux-arm-v7", - "sha256": "32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7" + "file": "buildx-v0.15.0.linux-arm-v7", + "sha256": "e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.14.1.linux-arm64", - "sha256": "82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64" + "file": "buildx-v0.15.0.linux-arm64", + "sha256": "ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.14.1.linux-ppc64le", - "sha256": "64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le" + "file": "buildx-v0.15.0.linux-ppc64le", + "sha256": "3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.14.1.linux-riscv64", - "sha256": "32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64" + "file": "buildx-v0.15.0.linux-riscv64", + "sha256": "6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.14.1.linux-s390x", - "sha256": "c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x" + "file": "buildx-v0.15.0.linux-s390x", + "sha256": "3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.14.1.windows-amd64.exe", - "sha256": "21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe" + "file": "buildx-v0.15.0.windows-amd64.exe", + "sha256": "f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.14.1.windows-arm64.exe", - "sha256": "309e6722ab7dcb236cd6844493ab5787924dd7ee83055cd46ea982e37ca273f5", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-arm64.exe" + "file": "buildx-v0.15.0.windows-arm64.exe", + "sha256": "46299c87244d2255e50edefbbdf78cb8e68218723a35b5d16dafc19136d9973e", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-arm64.exe" } }, - "version": "0.14.1" + "version": "0.15.0" }, "compose": { "arches": { From 0ce95ec28294b9cfcf10e7f9dff6a8b4142a2fa4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 11 Jun 2024 16:05:51 -0700 Subject: [PATCH 341/667] Update 25 to buildx 0.15.0 --- 25/cli/Dockerfile | 30 +++++----- 25/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 8cc9028f0..27708205e 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.14.1 +ENV DOCKER_BUILDX_VERSION 0.15.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64'; \ - sha256='68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64'; \ + sha256='6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6'; \ - sha256='afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6'; \ + sha256='78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7'; \ - sha256='32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7'; \ + sha256='e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64'; \ - sha256='82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64'; \ + sha256='ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le'; \ - sha256='64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le'; \ + sha256='3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64'; \ - sha256='32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64'; \ + sha256='6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x'; \ - sha256='c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x'; \ + sha256='3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 3a10309ed..4b2712936 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 +ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index c4e6971ad..9487deda2 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 +ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 4ef0f73c1..3c74e21df 100644 --- a/versions.json +++ b/versions.json @@ -163,52 +163,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.14.1.linux-amd64", - "sha256": "68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64" + "file": "buildx-v0.15.0.linux-amd64", + "sha256": "6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.14.1.linux-arm-v6", - "sha256": "afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6" + "file": "buildx-v0.15.0.linux-arm-v6", + "sha256": "78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.14.1.linux-arm-v7", - "sha256": "32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7" + "file": "buildx-v0.15.0.linux-arm-v7", + "sha256": "e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.14.1.linux-arm64", - "sha256": "82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64" + "file": "buildx-v0.15.0.linux-arm64", + "sha256": "ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.14.1.linux-ppc64le", - "sha256": "64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le" + "file": "buildx-v0.15.0.linux-ppc64le", + "sha256": "3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.14.1.linux-riscv64", - "sha256": "32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64" + "file": "buildx-v0.15.0.linux-riscv64", + "sha256": "6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.14.1.linux-s390x", - "sha256": "c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x" + "file": "buildx-v0.15.0.linux-s390x", + "sha256": "3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.14.1.windows-amd64.exe", - "sha256": "21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe" + "file": "buildx-v0.15.0.windows-amd64.exe", + "sha256": "f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.14.1.windows-arm64.exe", - "sha256": "309e6722ab7dcb236cd6844493ab5787924dd7ee83055cd46ea982e37ca273f5", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-arm64.exe" + "file": "buildx-v0.15.0.windows-arm64.exe", + "sha256": "46299c87244d2255e50edefbbdf78cb8e68218723a35b5d16dafc19136d9973e", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-arm64.exe" } }, - "version": "0.14.1" + "version": "0.15.0" }, "compose": { "arches": { From accd00cf98e6d1ad936fc245b9440b4d0c18e1c1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 11 Jun 2024 16:07:26 -0700 Subject: [PATCH 342/667] Update 26 to buildx 0.15.0 --- 26/cli/Dockerfile | 30 +++++----- 26/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index c5489ebd9..73f462226 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.14.1 +ENV DOCKER_BUILDX_VERSION 0.15.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64'; \ - sha256='68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64'; \ + sha256='6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6'; \ - sha256='afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6'; \ + sha256='78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7'; \ - sha256='32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7'; \ + sha256='e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64'; \ - sha256='82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64'; \ + sha256='ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le'; \ - sha256='64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le'; \ + sha256='3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64'; \ - sha256='32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64'; \ + sha256='6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x'; \ - sha256='c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x'; \ + sha256='3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index dde776bd8..8582cb36a 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 +ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 8133de2b5..77239a046 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.14.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928 +ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 3c74e21df..417a19fd6 100644 --- a/versions.json +++ b/versions.json @@ -304,52 +304,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.14.1.linux-amd64", - "sha256": "68e4f8895331ade982de8085a8c137b8af65f3ef95040b6c6113552243638508", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64" + "file": "buildx-v0.15.0.linux-amd64", + "sha256": "6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.14.1.linux-arm-v6", - "sha256": "afa9324a987d71891a8a55d33fa913e4464377c71e7cc84ba68a5d4c5e803f74", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v6" + "file": "buildx-v0.15.0.linux-arm-v6", + "sha256": "78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.14.1.linux-arm-v7", - "sha256": "32f0f7d30e498c1461b97b2591e5ed348e69b6d864243a838db6d2e6dc08144d", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm-v7" + "file": "buildx-v0.15.0.linux-arm-v7", + "sha256": "e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.14.1.linux-arm64", - "sha256": "82e776e50a84293c160e8c89c125b7a86295c7aa7f30751d6a7c051c171762c1", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64" + "file": "buildx-v0.15.0.linux-arm64", + "sha256": "ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.14.1.linux-ppc64le", - "sha256": "64b62a17df3b0cd5bf88a1bc3f83cd50ebd56b403c2ebf4668b5d697fd324bc0", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-ppc64le" + "file": "buildx-v0.15.0.linux-ppc64le", + "sha256": "3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.14.1.linux-riscv64", - "sha256": "32042b4dba38724404a063ee9851ebea1c85b46ebbfb58e7350ece04975fdc9c", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-riscv64" + "file": "buildx-v0.15.0.linux-riscv64", + "sha256": "6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.14.1.linux-s390x", - "sha256": "c273b1801cdb2c78079f9c33ecec266d5104973254e4e152d0205f14d7bf7bfc", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-s390x" + "file": "buildx-v0.15.0.linux-s390x", + "sha256": "3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.14.1.windows-amd64.exe", - "sha256": "21830c62d2a43ef2568ad325c338e892f7d534e656795e1fa49f68a679ac5928", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-amd64.exe" + "file": "buildx-v0.15.0.windows-amd64.exe", + "sha256": "f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.14.1.windows-arm64.exe", - "sha256": "309e6722ab7dcb236cd6844493ab5787924dd7ee83055cd46ea982e37ca273f5", - "url": "https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.windows-arm64.exe" + "file": "buildx-v0.15.0.windows-arm64.exe", + "sha256": "46299c87244d2255e50edefbbdf78cb8e68218723a35b5d16dafc19136d9973e", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-arm64.exe" } }, - "version": "0.14.1" + "version": "0.15.0" }, "compose": { "arches": { From 822e301251f16c6096ce4bf60949cc92a8ad273b Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 12 Jun 2024 20:58:34 +0200 Subject: [PATCH 343/667] Add v27.0.0-rc1 pre-release --- 27-rc/cli/Dockerfile | 165 +++++++++++++ 27-rc/cli/docker-entrypoint.sh | 61 +++++ 27-rc/cli/modprobe.sh | 20 ++ 27-rc/dind-rootless/Dockerfile | 55 +++++ 27-rc/dind/Dockerfile | 108 ++++++++ 27-rc/dind/dockerd-entrypoint.sh | 232 ++++++++++++++++++ .../windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ versions.json | 143 ++++++++++- 9 files changed, 965 insertions(+), 1 deletion(-) create mode 100644 27-rc/cli/Dockerfile create mode 100755 27-rc/cli/docker-entrypoint.sh create mode 100755 27-rc/cli/modprobe.sh create mode 100644 27-rc/dind-rootless/Dockerfile create mode 100644 27-rc/dind/Dockerfile create mode 100755 27-rc/dind/dockerd-entrypoint.sh create mode 100644 27-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 27-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile new file mode 100644 index 000000000..56a8844e4 --- /dev/null +++ b/27-rc/cli/Dockerfile @@ -0,0 +1,165 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.20 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 27.0.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.15.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64'; \ + sha256='6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6'; \ + sha256='78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7'; \ + sha256='e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64'; \ + sha256='ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le'; \ + sha256='3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64'; \ + sha256='6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x'; \ + sha256='3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.27.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64'; \ + sha256='ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6'; \ + sha256='5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7'; \ + sha256='9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64'; \ + sha256='16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le'; \ + sha256='f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64'; \ + sha256='9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x'; \ + sha256='6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/27-rc/cli/docker-entrypoint.sh b/27-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/27-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/27-rc/cli/modprobe.sh b/27-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/27-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..a23bfb097 --- /dev/null +++ b/27-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.0.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile new file mode 100644 index 000000000..bde090198 --- /dev/null +++ b/27-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 + b="/sbin/${f/tables/tables-legacy}"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:27-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/27-rc/dind/dockerd-entrypoint.sh b/27-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..b11a1cffd --- /dev/null +++ b/27-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,232 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..8292103ff --- /dev/null +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..0fcb385e0 --- /dev/null +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 417a19fd6..a452ed0cc 100644 --- a/versions.json +++ b/versions.json @@ -421,5 +421,146 @@ ], "version": "26.1.4" }, - "26-rc": null + "26-rc": null, + "27": null, + "27-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.0.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.15.0.linux-amd64", + "sha256": "6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.15.0.linux-arm-v6", + "sha256": "78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.15.0.linux-arm-v7", + "sha256": "e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.15.0.linux-arm64", + "sha256": "ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.15.0.linux-ppc64le", + "sha256": "3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.15.0.linux-riscv64", + "sha256": "6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.15.0.linux-s390x", + "sha256": "3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.15.0.windows-amd64.exe", + "sha256": "f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.15.0.windows-arm64.exe", + "sha256": "46299c87244d2255e50edefbbdf78cb8e68218723a35b5d16dafc19136d9973e", + "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-arm64.exe" + } + }, + "version": "0.15.0" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "a6217853736f8936fedd3d20736e056b7416a8ef653f49d914504c3715855034", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "17feecc6038b7c95b64e3cd02bded53eec47f17cf4a54146ecaef70af3ca56c6", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "8ea87a0ea654035b1b46d8f5121a99d712958addda6626b0185ab713f24a0ed9", + "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.27.1" + }, + "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "27.0.0-rc.1" + } } From 3e5de599c6193c52ef2f37c1ae94c933188b6113 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 17 Jun 2024 15:51:04 -0700 Subject: [PATCH 344/667] Update 27-rc to 27.0.0-rc.2 --- 27-rc/cli/Dockerfile | 10 +++++----- 27-rc/dind-rootless/Dockerfile | 4 ++-- 27-rc/dind/Dockerfile | 8 ++++---- 27-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index 56a8844e4..a864492c6 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.0.0-rc.1 +ENV DOCKER_VERSION 27.0.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile index a23bfb097..4ccdaa7f1 100644 --- a/27-rc/dind-rootless/Dockerfile +++ b/27-rc/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/test/x86_64/docker-rootless-extras-27.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile index bde090198..610bde970 100644 --- a/27-rc/dind/Dockerfile +++ b/27-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index 8292103ff..2c9515db1 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/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 27.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.1.zip +ENV DOCKER_VERSION 27.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.2.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/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index 0fcb385e0..8b6a3d465 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/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 27.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.1.zip +ENV DOCKER_VERSION 27.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.2.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/versions.json b/versions.json index a452ed0cc..644bd7469 100644 --- a/versions.json +++ b/versions.json @@ -426,21 +426,21 @@ "27-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.0.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.2.zip" } }, "buildx": { @@ -561,6 +561,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.0.0-rc.1" + "version": "27.0.0-rc.2" } } From e32a14ac39a1e70aa9a894ea7b8cb901d1f92fb4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Jun 2024 16:04:16 -0700 Subject: [PATCH 345/667] Update 24 to buildx 0.15.1 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index bca2a8cad..690692e35 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_VERSION 0.15.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64'; \ - sha256='6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64'; \ + sha256='8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6'; \ - sha256='78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6'; \ + sha256='b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7'; \ - sha256='e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7'; \ + sha256='eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64'; \ - sha256='ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64'; \ + sha256='13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le'; \ - sha256='3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le'; \ + sha256='6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64'; \ - sha256='6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64'; \ + sha256='52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x'; \ - sha256='3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x'; \ + sha256='689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 01e150166..f98b709c9 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 +ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 8568226c5..b722af21b 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 +ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 644bd7469..932501c76 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.15.0.linux-amd64", - "sha256": "6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64" + "file": "buildx-v0.15.1.linux-amd64", + "sha256": "8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.15.0.linux-arm-v6", - "sha256": "78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6" + "file": "buildx-v0.15.1.linux-arm-v6", + "sha256": "b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.15.0.linux-arm-v7", - "sha256": "e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7" + "file": "buildx-v0.15.1.linux-arm-v7", + "sha256": "eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.15.0.linux-arm64", - "sha256": "ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64" + "file": "buildx-v0.15.1.linux-arm64", + "sha256": "13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.15.0.linux-ppc64le", - "sha256": "3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le" + "file": "buildx-v0.15.1.linux-ppc64le", + "sha256": "6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.15.0.linux-riscv64", - "sha256": "6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64" + "file": "buildx-v0.15.1.linux-riscv64", + "sha256": "52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.15.0.linux-s390x", - "sha256": "3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x" + "file": "buildx-v0.15.1.linux-s390x", + "sha256": "689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.15.0.windows-amd64.exe", - "sha256": "f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe" + "file": "buildx-v0.15.1.windows-amd64.exe", + "sha256": "d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.15.0.windows-arm64.exe", - "sha256": "46299c87244d2255e50edefbbdf78cb8e68218723a35b5d16dafc19136d9973e", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-arm64.exe" + "file": "buildx-v0.15.1.windows-arm64.exe", + "sha256": "09bc6cbba9d8b0a07ddfcbd700f27dd9d4c5b1336f47a2e40d3d0e3ead23ebbd", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-arm64.exe" } }, - "version": "0.15.0" + "version": "0.15.1" }, "compose": { "arches": { From 670d3870b2e4d796f19c93d0ea50d6d802de6534 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Jun 2024 16:06:13 -0700 Subject: [PATCH 346/667] Update 25 to buildx 0.15.1 --- 25/cli/Dockerfile | 30 +++++----- 25/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 27708205e..ccaa0463d 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_VERSION 0.15.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64'; \ - sha256='6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64'; \ + sha256='8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6'; \ - sha256='78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6'; \ + sha256='b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7'; \ - sha256='e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7'; \ + sha256='eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64'; \ - sha256='ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64'; \ + sha256='13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le'; \ - sha256='3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le'; \ + sha256='6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64'; \ - sha256='6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64'; \ + sha256='52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x'; \ - sha256='3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x'; \ + sha256='689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 4b2712936..03c92f55a 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 +ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 9487deda2..568c3b5f1 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 +ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 932501c76..0f3c9ceb0 100644 --- a/versions.json +++ b/versions.json @@ -163,52 +163,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.15.0.linux-amd64", - "sha256": "6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64" + "file": "buildx-v0.15.1.linux-amd64", + "sha256": "8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.15.0.linux-arm-v6", - "sha256": "78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6" + "file": "buildx-v0.15.1.linux-arm-v6", + "sha256": "b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.15.0.linux-arm-v7", - "sha256": "e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7" + "file": "buildx-v0.15.1.linux-arm-v7", + "sha256": "eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.15.0.linux-arm64", - "sha256": "ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64" + "file": "buildx-v0.15.1.linux-arm64", + "sha256": "13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.15.0.linux-ppc64le", - "sha256": "3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le" + "file": "buildx-v0.15.1.linux-ppc64le", + "sha256": "6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.15.0.linux-riscv64", - "sha256": "6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64" + "file": "buildx-v0.15.1.linux-riscv64", + "sha256": "52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.15.0.linux-s390x", - "sha256": "3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x" + "file": "buildx-v0.15.1.linux-s390x", + "sha256": "689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.15.0.windows-amd64.exe", - "sha256": "f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe" + "file": "buildx-v0.15.1.windows-amd64.exe", + "sha256": "d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.15.0.windows-arm64.exe", - "sha256": "46299c87244d2255e50edefbbdf78cb8e68218723a35b5d16dafc19136d9973e", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-arm64.exe" + "file": "buildx-v0.15.1.windows-arm64.exe", + "sha256": "09bc6cbba9d8b0a07ddfcbd700f27dd9d4c5b1336f47a2e40d3d0e3ead23ebbd", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-arm64.exe" } }, - "version": "0.15.0" + "version": "0.15.1" }, "compose": { "arches": { From e010b57ee2affaf414bb734435abf42025d1d055 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Jun 2024 16:08:15 -0700 Subject: [PATCH 347/667] Update 26 to buildx 0.15.1 --- 26/cli/Dockerfile | 30 +++++----- 26/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 73f462226..ed01841ee 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_VERSION 0.15.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64'; \ - sha256='6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64'; \ + sha256='8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6'; \ - sha256='78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6'; \ + sha256='b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7'; \ - sha256='e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7'; \ + sha256='eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64'; \ - sha256='ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64'; \ + sha256='13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le'; \ - sha256='3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le'; \ + sha256='6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64'; \ - sha256='6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64'; \ + sha256='52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x'; \ - sha256='3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x'; \ + sha256='689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 8582cb36a..f13217b47 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 +ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 77239a046..8dcdf65cc 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 +ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 0f3c9ceb0..3f9f0332a 100644 --- a/versions.json +++ b/versions.json @@ -304,52 +304,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.15.0.linux-amd64", - "sha256": "6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64" + "file": "buildx-v0.15.1.linux-amd64", + "sha256": "8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.15.0.linux-arm-v6", - "sha256": "78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6" + "file": "buildx-v0.15.1.linux-arm-v6", + "sha256": "b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.15.0.linux-arm-v7", - "sha256": "e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7" + "file": "buildx-v0.15.1.linux-arm-v7", + "sha256": "eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.15.0.linux-arm64", - "sha256": "ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64" + "file": "buildx-v0.15.1.linux-arm64", + "sha256": "13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.15.0.linux-ppc64le", - "sha256": "3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le" + "file": "buildx-v0.15.1.linux-ppc64le", + "sha256": "6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.15.0.linux-riscv64", - "sha256": "6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64" + "file": "buildx-v0.15.1.linux-riscv64", + "sha256": "52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.15.0.linux-s390x", - "sha256": "3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x" + "file": "buildx-v0.15.1.linux-s390x", + "sha256": "689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.15.0.windows-amd64.exe", - "sha256": "f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe" + "file": "buildx-v0.15.1.windows-amd64.exe", + "sha256": "d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.15.0.windows-arm64.exe", - "sha256": "46299c87244d2255e50edefbbdf78cb8e68218723a35b5d16dafc19136d9973e", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-arm64.exe" + "file": "buildx-v0.15.1.windows-arm64.exe", + "sha256": "09bc6cbba9d8b0a07ddfcbd700f27dd9d4c5b1336f47a2e40d3d0e3ead23ebbd", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-arm64.exe" } }, - "version": "0.15.0" + "version": "0.15.1" }, "compose": { "arches": { From b9cd989fcde95a4f8ee65d79ee934f3a79df04d6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Jun 2024 16:10:17 -0700 Subject: [PATCH 348/667] Update 27-rc to buildx 0.15.1 --- 27-rc/cli/Dockerfile | 30 +++++----- .../windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index a864492c6..cfb2180aa 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -55,38 +55,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.15.0 +ENV DOCKER_BUILDX_VERSION 0.15.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64'; \ - sha256='6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64'; \ + sha256='8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6'; \ - sha256='78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6'; \ + sha256='b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7'; \ - sha256='e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7'; \ + sha256='eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64'; \ - sha256='ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64'; \ + sha256='13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le'; \ - sha256='3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le'; \ + sha256='6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64'; \ - sha256='6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64'; \ + sha256='52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x'; \ - sha256='3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d'; \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x'; \ + sha256='689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index 2c9515db1..28b9d2ed9 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 +ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index 8b6a3d465..0b669f395 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774 +ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 3f9f0332a..04fad5397 100644 --- a/versions.json +++ b/versions.json @@ -446,52 +446,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.15.0.linux-amd64", - "sha256": "6569bb8b026b56d49a31aca80b61b4d0da1dbbf23ad6c925752790a9a350c9c5", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-amd64" + "file": "buildx-v0.15.1.linux-amd64", + "sha256": "8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.15.0.linux-arm-v6", - "sha256": "78627fe5baeef2ea6eb50a2a1206c5c479f8984f6637c75825c79f6a4b93fea7", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v6" + "file": "buildx-v0.15.1.linux-arm-v6", + "sha256": "b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.15.0.linux-arm-v7", - "sha256": "e48879480cf6dcfb76a743577b94a548d15e152b0d4fad82e12bb27f11ba0b26", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm-v7" + "file": "buildx-v0.15.1.linux-arm-v7", + "sha256": "eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.15.0.linux-arm64", - "sha256": "ad23578106a3a4f0a7bc9d8bdc9ba9155fa7b19889fba46f8f2c59fb10ab73fb", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-arm64" + "file": "buildx-v0.15.1.linux-arm64", + "sha256": "13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.15.0.linux-ppc64le", - "sha256": "3ec0f7f76a7abd93b2dfaa5ff314357113a66bce9eea205e206545de34a97471", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-ppc64le" + "file": "buildx-v0.15.1.linux-ppc64le", + "sha256": "6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.15.0.linux-riscv64", - "sha256": "6afcab070d6f939c13d9c1f3aeb9083fef58cb91c22d0b174f9dba7a6549a219", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-riscv64" + "file": "buildx-v0.15.1.linux-riscv64", + "sha256": "52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.15.0.linux-s390x", - "sha256": "3fbd476b321d8b844358f796f3158a2f6df78d4d16acc2fc8a82265a2642c39d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.linux-s390x" + "file": "buildx-v0.15.1.linux-s390x", + "sha256": "689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.15.0.windows-amd64.exe", - "sha256": "f9285890c7d0b68ed36a07d4db062bfdc8db2059fa59a812cdbef438cfa3f774", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-amd64.exe" + "file": "buildx-v0.15.1.windows-amd64.exe", + "sha256": "d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.15.0.windows-arm64.exe", - "sha256": "46299c87244d2255e50edefbbdf78cb8e68218723a35b5d16dafc19136d9973e", - "url": "https://github.com/docker/buildx/releases/download/v0.15.0/buildx-v0.15.0.windows-arm64.exe" + "file": "buildx-v0.15.1.windows-arm64.exe", + "sha256": "09bc6cbba9d8b0a07ddfcbd700f27dd9d4c5b1336f47a2e40d3d0e3ead23ebbd", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-arm64.exe" } }, - "version": "0.15.0" + "version": "0.15.1" }, "compose": { "arches": { From 12a00d721d4d84bd69ffd4a69f1f2851751ac2d9 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 18 Jun 2024 17:11:00 -0700 Subject: [PATCH 349/667] Also load `ip6_tables` when trying to load `ip_tables` This isn't used/necessary in the default configuration until Docker 27+, but it was optional behavior before that, so it's prudent for us to also try loading it any time we know we're not using nftables / have explicitly requested "legacy" `iptables`. --- 24/dind/dockerd-entrypoint.sh | 2 ++ 25/dind/dockerd-entrypoint.sh | 2 ++ 26/dind/dockerd-entrypoint.sh | 2 ++ 27-rc/dind/dockerd-entrypoint.sh | 2 ++ dockerd-entrypoint.sh | 2 ++ 5 files changed, 10 insertions(+) diff --git a/24/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh index b11a1cffd..6c06bb811 100755 --- a/24/dind/dockerd-entrypoint.sh +++ b/24/dind/dockerd-entrypoint.sh @@ -149,6 +149,7 @@ if [ "$1" = 'dockerd' ]; then iptablesLegacy="$DOCKER_IPTABLES_LEGACY" if [ -n "$iptablesLegacy" ]; then modprobe ip_tables || : + modprobe ip6_tables || : else modprobe nf_tables || : fi @@ -173,6 +174,7 @@ if [ "$1" = 'dockerd' ]; then if ! iptables -nL > /dev/null 2>&1; then # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) modprobe ip_tables || : + modprobe ip6_tables || : if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then iptablesLegacy=1 fi diff --git a/25/dind/dockerd-entrypoint.sh b/25/dind/dockerd-entrypoint.sh index b11a1cffd..6c06bb811 100755 --- a/25/dind/dockerd-entrypoint.sh +++ b/25/dind/dockerd-entrypoint.sh @@ -149,6 +149,7 @@ if [ "$1" = 'dockerd' ]; then iptablesLegacy="$DOCKER_IPTABLES_LEGACY" if [ -n "$iptablesLegacy" ]; then modprobe ip_tables || : + modprobe ip6_tables || : else modprobe nf_tables || : fi @@ -173,6 +174,7 @@ if [ "$1" = 'dockerd' ]; then if ! iptables -nL > /dev/null 2>&1; then # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) modprobe ip_tables || : + modprobe ip6_tables || : if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then iptablesLegacy=1 fi diff --git a/26/dind/dockerd-entrypoint.sh b/26/dind/dockerd-entrypoint.sh index b11a1cffd..6c06bb811 100755 --- a/26/dind/dockerd-entrypoint.sh +++ b/26/dind/dockerd-entrypoint.sh @@ -149,6 +149,7 @@ if [ "$1" = 'dockerd' ]; then iptablesLegacy="$DOCKER_IPTABLES_LEGACY" if [ -n "$iptablesLegacy" ]; then modprobe ip_tables || : + modprobe ip6_tables || : else modprobe nf_tables || : fi @@ -173,6 +174,7 @@ if [ "$1" = 'dockerd' ]; then if ! iptables -nL > /dev/null 2>&1; then # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) modprobe ip_tables || : + modprobe ip6_tables || : if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then iptablesLegacy=1 fi diff --git a/27-rc/dind/dockerd-entrypoint.sh b/27-rc/dind/dockerd-entrypoint.sh index b11a1cffd..6c06bb811 100755 --- a/27-rc/dind/dockerd-entrypoint.sh +++ b/27-rc/dind/dockerd-entrypoint.sh @@ -149,6 +149,7 @@ if [ "$1" = 'dockerd' ]; then iptablesLegacy="$DOCKER_IPTABLES_LEGACY" if [ -n "$iptablesLegacy" ]; then modprobe ip_tables || : + modprobe ip6_tables || : else modprobe nf_tables || : fi @@ -173,6 +174,7 @@ if [ "$1" = 'dockerd' ]; then if ! iptables -nL > /dev/null 2>&1; then # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) modprobe ip_tables || : + modprobe ip6_tables || : if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then iptablesLegacy=1 fi diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index b11a1cffd..6c06bb811 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -149,6 +149,7 @@ if [ "$1" = 'dockerd' ]; then iptablesLegacy="$DOCKER_IPTABLES_LEGACY" if [ -n "$iptablesLegacy" ]; then modprobe ip_tables || : + modprobe ip6_tables || : else modprobe nf_tables || : fi @@ -173,6 +174,7 @@ if [ "$1" = 'dockerd' ]; then if ! iptables -nL > /dev/null 2>&1; then # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) modprobe ip_tables || : + modprobe ip6_tables || : if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then iptablesLegacy=1 fi From 79288b23bee933f8fd1c89083f4433c8e133c835 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 20 Jun 2024 04:04:16 -0700 Subject: [PATCH 350/667] Update 24 to compose 2.27.2 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 690692e35..0be14cc1e 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_VERSION 2.27.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64'; \ - sha256='ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64'; \ + sha256='6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6'; \ - sha256='5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6'; \ + sha256='10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7'; \ - sha256='9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7'; \ + sha256='b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64'; \ - sha256='16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64'; \ + sha256='de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le'; \ - sha256='f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le'; \ + sha256='5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64'; \ - sha256='9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64'; \ + sha256='2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x'; \ - sha256='6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x'; \ + sha256='4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index f98b709c9..86a640f98 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db +ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index b722af21b..940933849 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db +ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 04fad5397..e554ea668 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64" + "sha256": "6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6" + "sha256": "10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7" + "sha256": "b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64" + "sha256": "de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "a6217853736f8936fedd3d20736e056b7416a8ef653f49d914504c3715855034", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-x86_64" + "sha256": "1d72f1ff551509efaa0446fb43747e796591e48c1fb21d12ae3c216f68fbf011", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "17feecc6038b7c95b64e3cd02bded53eec47f17cf4a54146ecaef70af3ca56c6", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-aarch64" + "sha256": "7aabc994cc5a6e949ad20107d8fe9686e48f077d33156d9827c16c6a50b11143", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le" + "sha256": "5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64" + "sha256": "2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x" + "sha256": "4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe" + "sha256": "b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "8ea87a0ea654035b1b46d8f5121a99d712958addda6626b0185ab713f24a0ed9", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-aarch64.exe" + "sha256": "2dda11cc6efc01d504786915f3a70b0b0e8f4ccc9dc99731dcec3e506c64130a", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.27.1" + "version": "2.27.2" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From b3aeddeb388be54934fac1e8f0faebfc4c2b16b2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 20 Jun 2024 04:06:29 -0700 Subject: [PATCH 351/667] Update 25 to compose 2.27.2 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index ccaa0463d..d76d851bc 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_VERSION 2.27.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64'; \ - sha256='ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64'; \ + sha256='6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6'; \ - sha256='5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6'; \ + sha256='10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7'; \ - sha256='9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7'; \ + sha256='b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64'; \ - sha256='16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64'; \ + sha256='de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le'; \ - sha256='f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le'; \ + sha256='5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64'; \ - sha256='9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64'; \ + sha256='2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x'; \ - sha256='6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x'; \ + sha256='4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 03c92f55a..e39f2738f 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db +ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 568c3b5f1..5827843ca 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db +ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index e554ea668..96481be18 100644 --- a/versions.json +++ b/versions.json @@ -214,61 +214,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64" + "sha256": "6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6" + "sha256": "10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7" + "sha256": "b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64" + "sha256": "de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "a6217853736f8936fedd3d20736e056b7416a8ef653f49d914504c3715855034", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-x86_64" + "sha256": "1d72f1ff551509efaa0446fb43747e796591e48c1fb21d12ae3c216f68fbf011", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "17feecc6038b7c95b64e3cd02bded53eec47f17cf4a54146ecaef70af3ca56c6", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-aarch64" + "sha256": "7aabc994cc5a6e949ad20107d8fe9686e48f077d33156d9827c16c6a50b11143", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le" + "sha256": "5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64" + "sha256": "2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x" + "sha256": "4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe" + "sha256": "b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "8ea87a0ea654035b1b46d8f5121a99d712958addda6626b0185ab713f24a0ed9", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-aarch64.exe" + "sha256": "2dda11cc6efc01d504786915f3a70b0b0e8f4ccc9dc99731dcec3e506c64130a", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.27.1" + "version": "2.27.2" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 879ff3423d08c1ff2a45bc4388833f18692f305c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 20 Jun 2024 04:08:32 -0700 Subject: [PATCH 352/667] Update 26 to compose 2.27.2 --- 26/cli/Dockerfile | 30 ++++++------ 26/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index ed01841ee..4cf4189cb 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_VERSION 2.27.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64'; \ - sha256='ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64'; \ + sha256='6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6'; \ - sha256='5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6'; \ + sha256='10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7'; \ - sha256='9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7'; \ + sha256='b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64'; \ - sha256='16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64'; \ + sha256='de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le'; \ - sha256='f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le'; \ + sha256='5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64'; \ - sha256='9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64'; \ + sha256='2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x'; \ - sha256='6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x'; \ + sha256='4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index f13217b47..42255bd59 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db +ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 8dcdf65cc..cdccad560 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db +ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 96481be18..6ab575193 100644 --- a/versions.json +++ b/versions.json @@ -355,61 +355,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64" + "sha256": "6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6" + "sha256": "10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7" + "sha256": "b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64" + "sha256": "de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "a6217853736f8936fedd3d20736e056b7416a8ef653f49d914504c3715855034", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-x86_64" + "sha256": "1d72f1ff551509efaa0446fb43747e796591e48c1fb21d12ae3c216f68fbf011", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "17feecc6038b7c95b64e3cd02bded53eec47f17cf4a54146ecaef70af3ca56c6", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-aarch64" + "sha256": "7aabc994cc5a6e949ad20107d8fe9686e48f077d33156d9827c16c6a50b11143", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le" + "sha256": "5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64" + "sha256": "2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x" + "sha256": "4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe" + "sha256": "b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "8ea87a0ea654035b1b46d8f5121a99d712958addda6626b0185ab713f24a0ed9", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-aarch64.exe" + "sha256": "2dda11cc6efc01d504786915f3a70b0b0e8f4ccc9dc99731dcec3e506c64130a", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.27.1" + "version": "2.27.2" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 255b5d8fce6d3f1b4013f1e2a98c2ef1e17b5e14 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 20 Jun 2024 04:10:40 -0700 Subject: [PATCH 353/667] Update 27-rc to compose 2.27.2 --- 27-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index cfb2180aa..afe933715 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.27.1 +ENV DOCKER_COMPOSE_VERSION 2.27.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64'; \ - sha256='ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64'; \ + sha256='6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6'; \ - sha256='5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6'; \ + sha256='10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7'; \ - sha256='9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7'; \ + sha256='b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64'; \ - sha256='16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64'; \ + sha256='de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le'; \ - sha256='f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le'; \ + sha256='5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64'; \ - sha256='9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64'; \ + sha256='2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x'; \ - sha256='6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed'; \ + url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x'; \ + sha256='4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index 28b9d2ed9..0c66ca154 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db +ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index 0b669f395..dffd7cc19 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db +ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6ab575193..003cdd395 100644 --- a/versions.json +++ b/versions.json @@ -497,61 +497,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ddc876fe2a89d5b7ea455146b0975bfe52904eecba9b192193377d6f99d69ad9", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-x86_64" + "sha256": "6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "5f244291153cdd7facfe5007aa37f393d139c245b870025b8e86ef88a8de2705", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv6" + "sha256": "10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9dcfa9523dc912370417b7ccc3d81900bbb98dd9addbff0d218398bbe9078bbd", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-armv7" + "sha256": "b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "16e93b9c2fc147d29ca1acbb8ceab6a50a0e26af777f43dc7a753cb883142617", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-aarch64" + "sha256": "de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "a6217853736f8936fedd3d20736e056b7416a8ef653f49d914504c3715855034", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-x86_64" + "sha256": "1d72f1ff551509efaa0446fb43747e796591e48c1fb21d12ae3c216f68fbf011", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "17feecc6038b7c95b64e3cd02bded53eec47f17cf4a54146ecaef70af3ca56c6", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-darwin-aarch64" + "sha256": "7aabc994cc5a6e949ad20107d8fe9686e48f077d33156d9827c16c6a50b11143", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "f351bfdbb6bb9d18b33672ccba6dd31c53a3bd1b81f9e9052fc6d9125e7d5719", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-ppc64le" + "sha256": "5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9940bd7533bcbd087d5301b8348136bc8922aa75739e3e359d8367e2f6dd7005", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-riscv64" + "sha256": "2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6f4b6bb51987b2f61b91cfe4017a8d162e86b82ba3ae074b99b06a1ebe4387ed", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-linux-s390x" + "sha256": "4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "354e903701dbd3e7ee3c4259de928367776864bb850efe677d129202638843db", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-x86_64.exe" + "sha256": "b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "8ea87a0ea654035b1b46d8f5121a99d712958addda6626b0185ab713f24a0ed9", - "url": "https://github.com/docker/compose/releases/download/v2.27.1/docker-compose-windows-aarch64.exe" + "sha256": "2dda11cc6efc01d504786915f3a70b0b0e8f4ccc9dc99731dcec3e506c64130a", + "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.27.1" + "version": "2.27.2" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 7576de689566038ee78e791e666aa25f00bb46b0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 20 Jun 2024 16:04:54 -0700 Subject: [PATCH 354/667] Update 27-rc to 27.0.1-rc.1 --- 27-rc/cli/Dockerfile | 10 +++++----- 27-rc/dind-rootless/Dockerfile | 4 ++-- 27-rc/dind/Dockerfile | 8 ++++---- 27-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index afe933715..05d4e7203 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.0.0-rc.2 +ENV DOCKER_VERSION 27.0.1-rc.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.1-rc.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.0.1-rc.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.0.1-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.1-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile index 4ccdaa7f1..bdf73ba4f 100644 --- a/27-rc/dind-rootless/Dockerfile +++ b/27-rc/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/test/x86_64/docker-rootless-extras-27.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.0.1-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.1-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile index 610bde970..9f716579a 100644 --- a/27-rc/dind/Dockerfile +++ b/27-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.1-rc.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.0.1-rc.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.0.1-rc.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.1-rc.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index 0c66ca154..e2084de03 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/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 27.0.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.2.zip +ENV DOCKER_VERSION 27.0.1-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.1-rc.1.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/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index dffd7cc19..e50cf92cb 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/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 27.0.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.2.zip +ENV DOCKER_VERSION 27.0.1-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.1-rc.1.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/versions.json b/versions.json index 003cdd395..644e7f419 100644 --- a/versions.json +++ b/versions.json @@ -426,21 +426,21 @@ "27-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.0.1-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.0.1-rc.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.0.1-rc.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.0.1-rc.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.0.1-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.1-rc.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.0.0-rc.2.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.0.1-rc.1.zip" } }, "buildx": { @@ -561,6 +561,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.0.0-rc.2" + "version": "27.0.1-rc.1" } } From 81526b8043ac3a2f93d86b2bae95f6e70ca98caf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Jun 2024 10:04:19 -0700 Subject: [PATCH 355/667] Update 24 to compose 2.28.0 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 0be14cc1e..c23daa411 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_VERSION 2.28.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64'; \ - sha256='6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64'; \ + sha256='359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6'; \ - sha256='10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6'; \ + sha256='398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7'; \ - sha256='b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7'; \ + sha256='604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64'; \ - sha256='de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64'; \ + sha256='296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le'; \ - sha256='5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le'; \ + sha256='c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64'; \ - sha256='2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64'; \ + sha256='b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x'; \ - sha256='4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x'; \ + sha256='f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 86a640f98..594ee1601 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d +ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 940933849..3b6cbda8b 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d +ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 644e7f419..0ecb1b45c 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64" + "sha256": "359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6" + "sha256": "398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7" + "sha256": "604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64" + "sha256": "296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "1d72f1ff551509efaa0446fb43747e796591e48c1fb21d12ae3c216f68fbf011", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-x86_64" + "sha256": "9e8301f9106829eb123f5339e4061682e9a1e4318e8e27a11a4a6e53c3fad1bf", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7aabc994cc5a6e949ad20107d8fe9686e48f077d33156d9827c16c6a50b11143", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-aarch64" + "sha256": "5d5956cb3b5387656b78f6cfaf649aa0c378693a8ae3655d21b5b49fae6c94e4", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le" + "sha256": "c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64" + "sha256": "b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x" + "sha256": "f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe" + "sha256": "3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2dda11cc6efc01d504786915f3a70b0b0e8f4ccc9dc99731dcec3e506c64130a", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-aarch64.exe" + "sha256": "2b448b8ff3163e6b493adbe0ef225ab88f9325c6a7ac564616baaa9e0c69cc84", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.27.2" + "version": "2.28.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 14d04d4a0670177a47542327d8ecb5475b39412e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Jun 2024 10:06:26 -0700 Subject: [PATCH 356/667] Update 25 to compose 2.28.0 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index d76d851bc..fefd48cd0 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_VERSION 2.28.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64'; \ - sha256='6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64'; \ + sha256='359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6'; \ - sha256='10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6'; \ + sha256='398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7'; \ - sha256='b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7'; \ + sha256='604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64'; \ - sha256='de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64'; \ + sha256='296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le'; \ - sha256='5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le'; \ + sha256='c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64'; \ - sha256='2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64'; \ + sha256='b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x'; \ - sha256='4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x'; \ + sha256='f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index e39f2738f..cdb603cb1 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d +ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 5827843ca..46ced3f36 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d +ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 0ecb1b45c..35fe99e5c 100644 --- a/versions.json +++ b/versions.json @@ -214,61 +214,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64" + "sha256": "359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6" + "sha256": "398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7" + "sha256": "604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64" + "sha256": "296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "1d72f1ff551509efaa0446fb43747e796591e48c1fb21d12ae3c216f68fbf011", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-x86_64" + "sha256": "9e8301f9106829eb123f5339e4061682e9a1e4318e8e27a11a4a6e53c3fad1bf", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7aabc994cc5a6e949ad20107d8fe9686e48f077d33156d9827c16c6a50b11143", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-aarch64" + "sha256": "5d5956cb3b5387656b78f6cfaf649aa0c378693a8ae3655d21b5b49fae6c94e4", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le" + "sha256": "c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64" + "sha256": "b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x" + "sha256": "f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe" + "sha256": "3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2dda11cc6efc01d504786915f3a70b0b0e8f4ccc9dc99731dcec3e506c64130a", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-aarch64.exe" + "sha256": "2b448b8ff3163e6b493adbe0ef225ab88f9325c6a7ac564616baaa9e0c69cc84", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.27.2" + "version": "2.28.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From d83adb67f0100760aba58661d303d0f0afd989ea Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Jun 2024 10:08:33 -0700 Subject: [PATCH 357/667] Update 26 to compose 2.28.0 --- 26/cli/Dockerfile | 30 ++++++------ 26/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 4cf4189cb..e4f7fb996 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_VERSION 2.28.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64'; \ - sha256='6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64'; \ + sha256='359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6'; \ - sha256='10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6'; \ + sha256='398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7'; \ - sha256='b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7'; \ + sha256='604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64'; \ - sha256='de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64'; \ + sha256='296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le'; \ - sha256='5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le'; \ + sha256='c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64'; \ - sha256='2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64'; \ + sha256='b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x'; \ - sha256='4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x'; \ + sha256='f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 42255bd59..9b9d1fd79 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d +ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index cdccad560..89109301c 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d +ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 35fe99e5c..38cf4f474 100644 --- a/versions.json +++ b/versions.json @@ -355,61 +355,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64" + "sha256": "359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6" + "sha256": "398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7" + "sha256": "604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64" + "sha256": "296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "1d72f1ff551509efaa0446fb43747e796591e48c1fb21d12ae3c216f68fbf011", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-x86_64" + "sha256": "9e8301f9106829eb123f5339e4061682e9a1e4318e8e27a11a4a6e53c3fad1bf", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7aabc994cc5a6e949ad20107d8fe9686e48f077d33156d9827c16c6a50b11143", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-aarch64" + "sha256": "5d5956cb3b5387656b78f6cfaf649aa0c378693a8ae3655d21b5b49fae6c94e4", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le" + "sha256": "c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64" + "sha256": "b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x" + "sha256": "f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe" + "sha256": "3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2dda11cc6efc01d504786915f3a70b0b0e8f4ccc9dc99731dcec3e506c64130a", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-aarch64.exe" + "sha256": "2b448b8ff3163e6b493adbe0ef225ab88f9325c6a7ac564616baaa9e0c69cc84", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.27.2" + "version": "2.28.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From c4710def3429b65e1a0eebeb58fa0282425f0fdb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Jun 2024 10:10:36 -0700 Subject: [PATCH 358/667] Update 27-rc to compose 2.28.0 --- 27-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index 05d4e7203..4b2912ca8 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.27.2 +ENV DOCKER_COMPOSE_VERSION 2.28.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64'; \ - sha256='6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64'; \ + sha256='359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6'; \ - sha256='10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6'; \ + sha256='398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7'; \ - sha256='b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7'; \ + sha256='604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64'; \ - sha256='de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64'; \ + sha256='296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le'; \ - sha256='5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le'; \ + sha256='c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64'; \ - sha256='2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64'; \ + sha256='b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x'; \ - sha256='4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b'; \ + url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x'; \ + sha256='f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index e2084de03..b89bafbf1 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d +ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index e50cf92cb..211fb821e 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.27.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d +ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 38cf4f474..219512cd7 100644 --- a/versions.json +++ b/versions.json @@ -497,61 +497,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6fbaf6e93ccc43078a71a12db1d38224725cb5a9675391c38510355073f24066", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-x86_64" + "sha256": "359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "10b465c1771c262d372e24b09ed30fdc63687e35ae61c2365089e3998372a776", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv6" + "sha256": "398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "b5bd40dfadf089617fe9cacb7a08d6fd5fae28e2a465191be1f25f22ffead344", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-armv7" + "sha256": "604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "de8c48203f4876fe3ae8bf27081a9aa69dc87de67a705f9d76c3a3ad776ed0c2", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-aarch64" + "sha256": "296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "1d72f1ff551509efaa0446fb43747e796591e48c1fb21d12ae3c216f68fbf011", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-x86_64" + "sha256": "9e8301f9106829eb123f5339e4061682e9a1e4318e8e27a11a4a6e53c3fad1bf", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7aabc994cc5a6e949ad20107d8fe9686e48f077d33156d9827c16c6a50b11143", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-darwin-aarch64" + "sha256": "5d5956cb3b5387656b78f6cfaf649aa0c378693a8ae3655d21b5b49fae6c94e4", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "5810b3e6184032edbd21f12ed165ddecc823b8222ff5e4f6c55112af6f617c6d", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-ppc64le" + "sha256": "c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "2c138daa9eaa909434c808018c4ab748a5f25caee16e3a7810fbeb3897b40878", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-riscv64" + "sha256": "b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "4084bdab8782e98c57a5f7aa7384699490048ce117dc7e70cad183702cc1645b", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-linux-s390x" + "sha256": "f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "b9878421deeff63bb4685a0ee502fc737429123f68ee40de326cdc9fab800c1d", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-x86_64.exe" + "sha256": "3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2dda11cc6efc01d504786915f3a70b0b0e8f4ccc9dc99731dcec3e506c64130a", - "url": "https://github.com/docker/compose/releases/download/v2.27.2/docker-compose-windows-aarch64.exe" + "sha256": "2b448b8ff3163e6b493adbe0ef225ab88f9325c6a7ac564616baaa9e0c69cc84", + "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.27.2" + "version": "2.28.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 581ac7f48197b1b82993873d04de0a6c6431df22 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 24 Jun 2024 10:04:16 -0700 Subject: [PATCH 359/667] Update 24 to compose 2.28.1 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index c23daa411..7ebc95129 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_VERSION 2.28.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64'; \ - sha256='359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64'; \ + sha256='5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6'; \ - sha256='398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6'; \ + sha256='ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7'; \ - sha256='604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7'; \ + sha256='d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64'; \ - sha256='296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64'; \ + sha256='1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le'; \ - sha256='c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le'; \ + sha256='c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64'; \ - sha256='b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64'; \ + sha256='9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x'; \ - sha256='f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x'; \ + sha256='c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 594ee1601..195546937 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 +ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 3b6cbda8b..c62ce89c6 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 +ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 219512cd7..93244d225 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64" + "sha256": "5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6" + "sha256": "ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7" + "sha256": "d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64" + "sha256": "1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9e8301f9106829eb123f5339e4061682e9a1e4318e8e27a11a4a6e53c3fad1bf", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-x86_64" + "sha256": "0c4646a8c12328372cda2e7ca16f16902b7d4824645b42f740b364102ef262b7", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5d5956cb3b5387656b78f6cfaf649aa0c378693a8ae3655d21b5b49fae6c94e4", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-aarch64" + "sha256": "5e2a812b7ea4e55f5ff1f6cb4fa908ee74754b6a8a1a36c5959ec8490eeaa35d", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le" + "sha256": "c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64" + "sha256": "9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x" + "sha256": "c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe" + "sha256": "7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2b448b8ff3163e6b493adbe0ef225ab88f9325c6a7ac564616baaa9e0c69cc84", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-aarch64.exe" + "sha256": "99921947df0dc85bac3995492ee6ab0de6aefdea866ef304771071604ed2697f", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.28.0" + "version": "2.28.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 0de39b0b5c83f4f2d849f2e41b91a2eec7645f83 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 24 Jun 2024 10:06:04 -0700 Subject: [PATCH 360/667] Update 25 to compose 2.28.1 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index fefd48cd0..25a9fcf3a 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_VERSION 2.28.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64'; \ - sha256='359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64'; \ + sha256='5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6'; \ - sha256='398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6'; \ + sha256='ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7'; \ - sha256='604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7'; \ + sha256='d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64'; \ - sha256='296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64'; \ + sha256='1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le'; \ - sha256='c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le'; \ + sha256='c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64'; \ - sha256='b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64'; \ + sha256='9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x'; \ - sha256='f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x'; \ + sha256='c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index cdb603cb1..98faabf98 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 +ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 46ced3f36..4c712c096 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 +ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 93244d225..570171c65 100644 --- a/versions.json +++ b/versions.json @@ -214,61 +214,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64" + "sha256": "5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6" + "sha256": "ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7" + "sha256": "d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64" + "sha256": "1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9e8301f9106829eb123f5339e4061682e9a1e4318e8e27a11a4a6e53c3fad1bf", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-x86_64" + "sha256": "0c4646a8c12328372cda2e7ca16f16902b7d4824645b42f740b364102ef262b7", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5d5956cb3b5387656b78f6cfaf649aa0c378693a8ae3655d21b5b49fae6c94e4", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-aarch64" + "sha256": "5e2a812b7ea4e55f5ff1f6cb4fa908ee74754b6a8a1a36c5959ec8490eeaa35d", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le" + "sha256": "c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64" + "sha256": "9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x" + "sha256": "c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe" + "sha256": "7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2b448b8ff3163e6b493adbe0ef225ab88f9325c6a7ac564616baaa9e0c69cc84", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-aarch64.exe" + "sha256": "99921947df0dc85bac3995492ee6ab0de6aefdea866ef304771071604ed2697f", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.28.0" + "version": "2.28.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From ab4a58f46763f976f9eb9d0c3379c389c0211928 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 24 Jun 2024 10:07:41 -0700 Subject: [PATCH 361/667] Update 26 to compose 2.28.1 --- 26/cli/Dockerfile | 30 ++++++------ 26/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index e4f7fb996..3a93add2c 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_VERSION 2.28.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64'; \ - sha256='359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64'; \ + sha256='5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6'; \ - sha256='398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6'; \ + sha256='ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7'; \ - sha256='604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7'; \ + sha256='d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64'; \ - sha256='296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64'; \ + sha256='1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le'; \ - sha256='c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le'; \ + sha256='c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64'; \ - sha256='b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64'; \ + sha256='9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x'; \ - sha256='f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x'; \ + sha256='c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 9b9d1fd79..153c13f92 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 +ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 89109301c..c0b69e841 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 +ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 570171c65..d61da014a 100644 --- a/versions.json +++ b/versions.json @@ -355,61 +355,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64" + "sha256": "5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6" + "sha256": "ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7" + "sha256": "d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64" + "sha256": "1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9e8301f9106829eb123f5339e4061682e9a1e4318e8e27a11a4a6e53c3fad1bf", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-x86_64" + "sha256": "0c4646a8c12328372cda2e7ca16f16902b7d4824645b42f740b364102ef262b7", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5d5956cb3b5387656b78f6cfaf649aa0c378693a8ae3655d21b5b49fae6c94e4", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-aarch64" + "sha256": "5e2a812b7ea4e55f5ff1f6cb4fa908ee74754b6a8a1a36c5959ec8490eeaa35d", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le" + "sha256": "c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64" + "sha256": "9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x" + "sha256": "c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe" + "sha256": "7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2b448b8ff3163e6b493adbe0ef225ab88f9325c6a7ac564616baaa9e0c69cc84", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-aarch64.exe" + "sha256": "99921947df0dc85bac3995492ee6ab0de6aefdea866ef304771071604ed2697f", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.28.0" + "version": "2.28.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 09d953c7b2cd9e558d82d2ef33a4b0891f4a486f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 24 Jun 2024 10:09:22 -0700 Subject: [PATCH 362/667] Update 27-rc to compose 2.28.1 --- 27-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index 4b2912ca8..36341d95b 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -101,38 +101,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.28.0 +ENV DOCKER_COMPOSE_VERSION 2.28.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64'; \ - sha256='359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64'; \ + sha256='5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6'; \ - sha256='398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6'; \ + sha256='ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7'; \ - sha256='604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7'; \ + sha256='d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64'; \ - sha256='296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64'; \ + sha256='1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le'; \ - sha256='c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le'; \ + sha256='c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64'; \ - sha256='b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64'; \ + sha256='9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x'; \ - sha256='f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d'; \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x'; \ + sha256='c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index b89bafbf1..1b28e6c3b 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 +ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index 211fb821e..4c3208dfa 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5 +ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index d61da014a..fd84e82db 100644 --- a/versions.json +++ b/versions.json @@ -497,61 +497,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "359043c2336e243662d7038c3edfeadcd5b9fc28dabe6973dbaecf48c0c1f967", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-x86_64" + "sha256": "5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "398d717e6cc9515ca0325035cfe626cbaaa1023754cfd22c13eab6b29ecc2d54", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv6" + "sha256": "ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "604c00f22176ca8291f43d22f066cfcc89f4c09de2113d287f72c0bdcf611e46", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-armv7" + "sha256": "d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "296076f4d14d2a816ad750f6890355fc118692814e4b4542942794817f869d37", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-aarch64" + "sha256": "1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9e8301f9106829eb123f5339e4061682e9a1e4318e8e27a11a4a6e53c3fad1bf", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-x86_64" + "sha256": "0c4646a8c12328372cda2e7ca16f16902b7d4824645b42f740b364102ef262b7", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5d5956cb3b5387656b78f6cfaf649aa0c378693a8ae3655d21b5b49fae6c94e4", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-darwin-aarch64" + "sha256": "5e2a812b7ea4e55f5ff1f6cb4fa908ee74754b6a8a1a36c5959ec8490eeaa35d", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "c88c097fa475f07140c01e3ca370a503b927f377f200114fa17e0bee6e0cbc4d", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-ppc64le" + "sha256": "c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "b563b99c5a1c03a1a83cb56ea1f7a492ef74e137afd0cbea485b828b6c61dbe5", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-riscv64" + "sha256": "9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "f701bd64dc5b204352c788931b43de9c778d47eed1be7caa81b57fc47a09164d", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-linux-s390x" + "sha256": "c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "3fc914471985068a32eded1e4acbddcebae375eecb344ebb1168713ed29dcfc5", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-x86_64.exe" + "sha256": "7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2b448b8ff3163e6b493adbe0ef225ab88f9325c6a7ac564616baaa9e0c69cc84", - "url": "https://github.com/docker/compose/releases/download/v2.28.0/docker-compose-windows-aarch64.exe" + "sha256": "99921947df0dc85bac3995492ee6ab0de6aefdea866ef304771071604ed2697f", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.28.0" + "version": "2.28.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From b317cabfb873fef32ac8cad0cd58d6e6c32a63a4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 25 Jun 2024 04:04:53 -0700 Subject: [PATCH 363/667] Update 27 to 27.0.1, buildx 0.15.1, compose 2.28.1 --- 27/cli/Dockerfile | 165 ++++++++++++ 27/cli/docker-entrypoint.sh | 61 +++++ 27/cli/modprobe.sh | 20 ++ 27/dind-rootless/Dockerfile | 55 ++++ 27/dind/Dockerfile | 108 ++++++++ 27/dind/dockerd-entrypoint.sh | 234 ++++++++++++++++++ 27/windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ versions.json | 141 ++++++++++- 9 files changed, 965 insertions(+), 1 deletion(-) create mode 100644 27/cli/Dockerfile create mode 100755 27/cli/docker-entrypoint.sh create mode 100755 27/cli/modprobe.sh create mode 100644 27/dind-rootless/Dockerfile create mode 100644 27/dind/Dockerfile create mode 100755 27/dind/dockerd-entrypoint.sh create mode 100644 27/windows/windowsservercore-1809/Dockerfile create mode 100644 27/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile new file mode 100644 index 000000000..58647064e --- /dev/null +++ b/27/cli/Dockerfile @@ -0,0 +1,165 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.20 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 27.0.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.0.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.15.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64'; \ + sha256='8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6'; \ + sha256='b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7'; \ + sha256='eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64'; \ + sha256='13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le'; \ + sha256='6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64'; \ + sha256='52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x'; \ + sha256='689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.28.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64'; \ + sha256='5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6'; \ + sha256='ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7'; \ + sha256='d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64'; \ + sha256='1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le'; \ + sha256='c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64'; \ + sha256='9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x'; \ + sha256='c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/27/cli/docker-entrypoint.sh b/27/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/27/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/27/cli/modprobe.sh b/27/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/27/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile new file mode 100644 index 000000000..92141f534 --- /dev/null +++ b/27/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +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-27.0.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile new file mode 100644 index 000000000..1208f4758 --- /dev/null +++ b/27/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 + b="/sbin/${f/tables/tables-legacy}"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.0.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:27-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/27/dind/dockerd-entrypoint.sh b/27/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..6c06bb811 --- /dev/null +++ b/27/dind/dockerd-entrypoint.sh @@ -0,0 +1,234 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..e32039008 --- /dev/null +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..101b23b85 --- /dev/null +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index fd84e82db..56a3b1da5 100644 --- a/versions.json +++ b/versions.json @@ -422,7 +422,146 @@ "version": "26.1.4" }, "26-rc": null, - "27": null, + "27": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.0.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.0.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.0.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.0.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.15.1.linux-amd64", + "sha256": "8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.15.1.linux-arm-v6", + "sha256": "b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.15.1.linux-arm-v7", + "sha256": "eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.15.1.linux-arm64", + "sha256": "13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.15.1.linux-ppc64le", + "sha256": "6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.15.1.linux-riscv64", + "sha256": "52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.15.1.linux-s390x", + "sha256": "689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.15.1.windows-amd64.exe", + "sha256": "d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.15.1.windows-arm64.exe", + "sha256": "09bc6cbba9d8b0a07ddfcbd700f27dd9d4c5b1336f47a2e40d3d0e3ead23ebbd", + "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-arm64.exe" + } + }, + "version": "0.15.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "0c4646a8c12328372cda2e7ca16f16902b7d4824645b42f740b364102ef262b7", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "5e2a812b7ea4e55f5ff1f6cb4fa908ee74754b6a8a1a36c5959ec8490eeaa35d", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "99921947df0dc85bac3995492ee6ab0de6aefdea866ef304771071604ed2697f", + "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.28.1" + }, + "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "27.0.1" + }, "27-rc": { "arches": { "amd64": { From 417e4527ee42031c6fa75de090ed88f34a312c77 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 25 Jun 2024 04:06:53 -0700 Subject: [PATCH 364/667] Update 27-rc --- 27-rc/cli/Dockerfile | 165 ------------ 27-rc/cli/docker-entrypoint.sh | 61 ----- 27-rc/cli/modprobe.sh | 20 -- 27-rc/dind-rootless/Dockerfile | 55 ---- 27-rc/dind/Dockerfile | 108 -------- 27-rc/dind/dockerd-entrypoint.sh | 234 ------------------ .../windows/windowsservercore-1809/Dockerfile | 91 ------- .../windowsservercore-ltsc2022/Dockerfile | 91 ------- versions.json | 141 +---------- 9 files changed, 1 insertion(+), 965 deletions(-) delete mode 100644 27-rc/cli/Dockerfile delete mode 100755 27-rc/cli/docker-entrypoint.sh delete mode 100755 27-rc/cli/modprobe.sh delete mode 100644 27-rc/dind-rootless/Dockerfile delete mode 100644 27-rc/dind/Dockerfile delete mode 100755 27-rc/dind/dockerd-entrypoint.sh delete mode 100644 27-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 27-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile deleted file mode 100644 index 36341d95b..000000000 --- a/27-rc/cli/Dockerfile +++ /dev/null @@ -1,165 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.20 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 27.0.1-rc.1 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.1-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.0.1-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.0.1-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.1-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.15.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64'; \ - sha256='8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6'; \ - sha256='b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7'; \ - sha256='eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64'; \ - sha256='13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le'; \ - sha256='6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64'; \ - sha256='52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x'; \ - sha256='689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.28.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64'; \ - sha256='5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6'; \ - sha256='ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7'; \ - sha256='d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64'; \ - sha256='1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le'; \ - sha256='c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64'; \ - sha256='9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x'; \ - sha256='c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/27-rc/cli/docker-entrypoint.sh b/27-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/27-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/27-rc/cli/modprobe.sh b/27-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/27-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile deleted file mode 100644 index bdf73ba4f..000000000 --- a/27-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.0.1-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.1-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile deleted file mode 100644 index 9f716579a..000000000 --- a/27-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 - b="/sbin/${f/tables/tables-legacy}"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.0.1-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.0.1-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.0.1-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.0.1-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:27-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/27-rc/dind/dockerd-entrypoint.sh b/27-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 6c06bb811..000000000 --- a/27-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 1b28e6c3b..000000000 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.0.1-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.1-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 4c3208dfa..000000000 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.0.1-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.0.1-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 56a3b1da5..4fb7de250 100644 --- a/versions.json +++ b/versions.json @@ -562,144 +562,5 @@ ], "version": "27.0.1" }, - "27-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.0.1-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.0.1-rc.1.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.0.1-rc.1.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.0.1-rc.1.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.0.1-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.0.1-rc.1.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.0.1-rc.1.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.15.1.linux-amd64", - "sha256": "8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.15.1.linux-arm-v6", - "sha256": "b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.15.1.linux-arm-v7", - "sha256": "eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.15.1.linux-arm64", - "sha256": "13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64" - }, - "ppc64le": { - "file": "buildx-v0.15.1.linux-ppc64le", - "sha256": "6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.15.1.linux-riscv64", - "sha256": "52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.15.1.linux-s390x", - "sha256": "689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.15.1.windows-amd64.exe", - "sha256": "d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.15.1.windows-arm64.exe", - "sha256": "09bc6cbba9d8b0a07ddfcbd700f27dd9d4c5b1336f47a2e40d3d0e3ead23ebbd", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-arm64.exe" - } - }, - "version": "0.15.1" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "0c4646a8c12328372cda2e7ca16f16902b7d4824645b42f740b364102ef262b7", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "5e2a812b7ea4e55f5ff1f6cb4fa908ee74754b6a8a1a36c5959ec8490eeaa35d", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "99921947df0dc85bac3995492ee6ab0de6aefdea866ef304771071604ed2697f", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.28.1" - }, - "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "27.0.1-rc.1" - } + "27-rc": null } From c0963f96ace4f48d13385cbf20356ae605edcb8b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 26 Jun 2024 16:04:46 -0700 Subject: [PATCH 365/667] Update 27 to 27.0.2 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 58647064e..1963ca690 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.0.1 +ENV DOCKER_VERSION 27.0.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index 92141f534..5eeb5f851 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index 1208f4758..5c59bc04f 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index e32039008..6586bbfe0 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.1.zip +ENV DOCKER_VERSION 27.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.2.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 101b23b85..b051d1a03 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.1.zip +ENV DOCKER_VERSION 27.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.2.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/versions.json b/versions.json index 4fb7de250..8afde15e8 100644 --- a/versions.json +++ b/versions.json @@ -425,21 +425,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.0.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.0.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.0.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.0.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.0.2.zip" } }, "buildx": { @@ -560,7 +560,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.0.1" + "version": "27.0.2" }, "27-rc": null } From 75c73110b6ee739dab28c30b757eec51484968c1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 1 Jul 2024 04:04:46 -0700 Subject: [PATCH 366/667] Update 27 to 27.0.3 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 1963ca690..1471fb1a0 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.0.2 +ENV DOCKER_VERSION 27.0.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.0.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index 5eeb5f851..eb1d5ddc9 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index 5c59bc04f..1ac26045b 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.0.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 6586bbfe0..51555ecf2 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.2.zip +ENV DOCKER_VERSION 27.0.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.3.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index b051d1a03..48fad8374 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.2.zip +ENV DOCKER_VERSION 27.0.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.3.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/versions.json b/versions.json index 8afde15e8..0bf9a0913 100644 --- a/versions.json +++ b/versions.json @@ -425,21 +425,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.0.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.0.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.0.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.0.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.0.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.0.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.0.3.zip" } }, "buildx": { @@ -560,7 +560,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.0.2" + "version": "27.0.3" }, "27-rc": null } From b348a31fc955dd6500a4aa9537bbef51688a181e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 1 Jul 2024 14:37:08 -0700 Subject: [PATCH 367/667] Add `git` to CLI variants - `docker build .` / `docker buildx build .` might shell out to git to ask about the context directory's `git status` - `DOCKER_BUILDKIT=0 docker build https://example/foo.git` will run git in the client context - `docker buildx build https://example/foo.git` will run git in the daemon context --- 24/cli/Dockerfile | 4 +++- 25/cli/Dockerfile | 4 +++- 26/cli/Dockerfile | 4 +++- 27/cli/Dockerfile | 4 +++- Dockerfile-cli.template | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 7ebc95129..719cf6cbc 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -9,7 +9,9 @@ FROM alpine:3.20 RUN apk add --no-cache \ ca-certificates \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git # ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) # - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 25a9fcf3a..4eeb1c433 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -9,7 +9,9 @@ FROM alpine:3.20 RUN apk add --no-cache \ ca-certificates \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git # ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) # - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 3a93add2c..c8a83d70e 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -9,7 +9,9 @@ FROM alpine:3.20 RUN apk add --no-cache \ ca-certificates \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git # ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) # - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 1471fb1a0..6c57a5628 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -9,7 +9,9 @@ FROM alpine:3.20 RUN apk add --no-cache \ ca-certificates \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git # ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) # - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 0e6e131cd..5b9eb2ac0 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -4,7 +4,9 @@ FROM alpine:3.20 RUN apk add --no-cache \ ca-certificates \ # DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git # ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) # - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 From 87e6ea6e31798bda00bde22898e24fe0a8275a7e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 9 Jul 2024 15:38:12 -0700 Subject: [PATCH 368/667] =?UTF-8?q?Update=20to=20actions/checkout@v4=20?= =?UTF-8?q?=F0=9F=99=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (this is effectively a functional no-op solving a "problem" that really ought to be solved at a different level within GHA) --- .github/workflows/ci.yml | 4 ++-- .github/workflows/verify-templating.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60de55976..264cebf62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: outputs: strategy: ${{ steps.generate-jobs.outputs.strategy }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: docker-library/bashbrew@HEAD - id: generate-jobs name: Generate Jobs @@ -41,7 +41,7 @@ jobs: name: ${{ matrix.name }} runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Prepare Environment run: ${{ matrix.runs.prepare }} - name: Pull Dependencies diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml index 14497bec6..2e1fb7872 100644 --- a/.github/workflows/verify-templating.yml +++ b/.github/workflows/verify-templating.yml @@ -13,7 +13,7 @@ jobs: name: Check For Uncomitted Changes runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Apply Templates run: ./apply-templates.sh - name: Check Git Status From f3e179fc5fc10b978bc6d333a7d6186d11803866 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 11 Jul 2024 16:04:20 -0700 Subject: [PATCH 369/667] Update 24 to buildx 0.16.0 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 719cf6cbc..35425a397 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_VERSION 0.16.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64'; \ - sha256='8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64'; \ + sha256='9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6'; \ - sha256='b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6'; \ + sha256='902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7'; \ - sha256='eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7'; \ + sha256='81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64'; \ - sha256='13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64'; \ + sha256='1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le'; \ - sha256='6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le'; \ + sha256='569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64'; \ - sha256='52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64'; \ + sha256='e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x'; \ - sha256='689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x'; \ + sha256='80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 195546937..bd644e715 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 +ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index c62ce89c6..a2efbd37a 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 +ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 0bf9a0913..3d7b9ca25 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.15.1.linux-amd64", - "sha256": "8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64" + "file": "buildx-v0.16.0.linux-amd64", + "sha256": "9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.15.1.linux-arm-v6", - "sha256": "b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6" + "file": "buildx-v0.16.0.linux-arm-v6", + "sha256": "902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.15.1.linux-arm-v7", - "sha256": "eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7" + "file": "buildx-v0.16.0.linux-arm-v7", + "sha256": "81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.15.1.linux-arm64", - "sha256": "13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64" + "file": "buildx-v0.16.0.linux-arm64", + "sha256": "1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.15.1.linux-ppc64le", - "sha256": "6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le" + "file": "buildx-v0.16.0.linux-ppc64le", + "sha256": "569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.15.1.linux-riscv64", - "sha256": "52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64" + "file": "buildx-v0.16.0.linux-riscv64", + "sha256": "e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.15.1.linux-s390x", - "sha256": "689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x" + "file": "buildx-v0.16.0.linux-s390x", + "sha256": "80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.15.1.windows-amd64.exe", - "sha256": "d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe" + "file": "buildx-v0.16.0.windows-amd64.exe", + "sha256": "6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.15.1.windows-arm64.exe", - "sha256": "09bc6cbba9d8b0a07ddfcbd700f27dd9d4c5b1336f47a2e40d3d0e3ead23ebbd", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-arm64.exe" + "file": "buildx-v0.16.0.windows-arm64.exe", + "sha256": "41c724c95f92204a1a8575e1e79b72f4667392090133e71c571c4d2cbfeffa64", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-arm64.exe" } }, - "version": "0.15.1" + "version": "0.16.0" }, "compose": { "arches": { From e9d4f3887eb113c9ca5b0574b96ab067a178cb67 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 11 Jul 2024 16:06:34 -0700 Subject: [PATCH 370/667] Update 25 to buildx 0.16.0 --- 25/cli/Dockerfile | 30 +++++----- 25/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 4eeb1c433..8fce11f00 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_VERSION 0.16.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64'; \ - sha256='8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64'; \ + sha256='9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6'; \ - sha256='b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6'; \ + sha256='902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7'; \ - sha256='eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7'; \ + sha256='81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64'; \ - sha256='13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64'; \ + sha256='1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le'; \ - sha256='6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le'; \ + sha256='569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64'; \ - sha256='52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64'; \ + sha256='e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x'; \ - sha256='689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x'; \ + sha256='80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 98faabf98..66e55b233 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 +ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 4c712c096..f29f3cf53 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 +ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 3d7b9ca25..be3f08d04 100644 --- a/versions.json +++ b/versions.json @@ -163,52 +163,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.15.1.linux-amd64", - "sha256": "8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64" + "file": "buildx-v0.16.0.linux-amd64", + "sha256": "9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.15.1.linux-arm-v6", - "sha256": "b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6" + "file": "buildx-v0.16.0.linux-arm-v6", + "sha256": "902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.15.1.linux-arm-v7", - "sha256": "eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7" + "file": "buildx-v0.16.0.linux-arm-v7", + "sha256": "81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.15.1.linux-arm64", - "sha256": "13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64" + "file": "buildx-v0.16.0.linux-arm64", + "sha256": "1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.15.1.linux-ppc64le", - "sha256": "6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le" + "file": "buildx-v0.16.0.linux-ppc64le", + "sha256": "569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.15.1.linux-riscv64", - "sha256": "52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64" + "file": "buildx-v0.16.0.linux-riscv64", + "sha256": "e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.15.1.linux-s390x", - "sha256": "689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x" + "file": "buildx-v0.16.0.linux-s390x", + "sha256": "80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.15.1.windows-amd64.exe", - "sha256": "d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe" + "file": "buildx-v0.16.0.windows-amd64.exe", + "sha256": "6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.15.1.windows-arm64.exe", - "sha256": "09bc6cbba9d8b0a07ddfcbd700f27dd9d4c5b1336f47a2e40d3d0e3ead23ebbd", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-arm64.exe" + "file": "buildx-v0.16.0.windows-arm64.exe", + "sha256": "41c724c95f92204a1a8575e1e79b72f4667392090133e71c571c4d2cbfeffa64", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-arm64.exe" } }, - "version": "0.15.1" + "version": "0.16.0" }, "compose": { "arches": { From bfc5d2e0cd4a7a41e73a1830ea383de76ccda960 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 11 Jul 2024 16:08:36 -0700 Subject: [PATCH 371/667] Update 26 to buildx 0.16.0 --- 26/cli/Dockerfile | 30 +++++----- 26/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index c8a83d70e..11a14b68e 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_VERSION 0.16.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64'; \ - sha256='8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64'; \ + sha256='9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6'; \ - sha256='b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6'; \ + sha256='902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7'; \ - sha256='eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7'; \ + sha256='81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64'; \ - sha256='13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64'; \ + sha256='1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le'; \ - sha256='6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le'; \ + sha256='569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64'; \ - sha256='52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64'; \ + sha256='e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x'; \ - sha256='689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x'; \ + sha256='80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 153c13f92..7ef67c9b3 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 +ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index c0b69e841..080eda3ef 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 +ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index be3f08d04..ee5ae739f 100644 --- a/versions.json +++ b/versions.json @@ -304,52 +304,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.15.1.linux-amd64", - "sha256": "8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64" + "file": "buildx-v0.16.0.linux-amd64", + "sha256": "9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.15.1.linux-arm-v6", - "sha256": "b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6" + "file": "buildx-v0.16.0.linux-arm-v6", + "sha256": "902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.15.1.linux-arm-v7", - "sha256": "eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7" + "file": "buildx-v0.16.0.linux-arm-v7", + "sha256": "81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.15.1.linux-arm64", - "sha256": "13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64" + "file": "buildx-v0.16.0.linux-arm64", + "sha256": "1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.15.1.linux-ppc64le", - "sha256": "6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le" + "file": "buildx-v0.16.0.linux-ppc64le", + "sha256": "569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.15.1.linux-riscv64", - "sha256": "52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64" + "file": "buildx-v0.16.0.linux-riscv64", + "sha256": "e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.15.1.linux-s390x", - "sha256": "689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x" + "file": "buildx-v0.16.0.linux-s390x", + "sha256": "80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.15.1.windows-amd64.exe", - "sha256": "d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe" + "file": "buildx-v0.16.0.windows-amd64.exe", + "sha256": "6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.15.1.windows-arm64.exe", - "sha256": "09bc6cbba9d8b0a07ddfcbd700f27dd9d4c5b1336f47a2e40d3d0e3ead23ebbd", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-arm64.exe" + "file": "buildx-v0.16.0.windows-arm64.exe", + "sha256": "41c724c95f92204a1a8575e1e79b72f4667392090133e71c571c4d2cbfeffa64", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-arm64.exe" } }, - "version": "0.15.1" + "version": "0.16.0" }, "compose": { "arches": { From bf7d7034099346397bdeac2a2178f2a1716e4feb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 11 Jul 2024 16:10:37 -0700 Subject: [PATCH 372/667] Update 27 to buildx 0.16.0 --- 27/cli/Dockerfile | 30 +++++----- 27/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 6c57a5628..37fbd0cdf 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.15.1 +ENV DOCKER_BUILDX_VERSION 0.16.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64'; \ - sha256='8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64'; \ + sha256='9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6'; \ - sha256='b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6'; \ + sha256='902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7'; \ - sha256='eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7'; \ + sha256='81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64'; \ - sha256='13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64'; \ + sha256='1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le'; \ - sha256='6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le'; \ + sha256='569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64'; \ - sha256='52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64'; \ + sha256='e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x'; \ - sha256='689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x'; \ + sha256='80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 51555ecf2..aca47b398 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 +ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 48fad8374..b84187904 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.15.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33 +ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ee5ae739f..882cfa06b 100644 --- a/versions.json +++ b/versions.json @@ -445,52 +445,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.15.1.linux-amd64", - "sha256": "8d486f0088b7407a90ad675525ba4a17d0a537741b9b33fe3391a88cafa2dd0b", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-amd64" + "file": "buildx-v0.16.0.linux-amd64", + "sha256": "9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.15.1.linux-arm-v6", - "sha256": "b4d1c41605b50b5549f1464461cfa72d010106bfb4606b45cc776daab4c25d7d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v6" + "file": "buildx-v0.16.0.linux-arm-v6", + "sha256": "902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.15.1.linux-arm-v7", - "sha256": "eabc32a4a86f943c3996eb2df5efd0d02d12603e356941ed46c132c64cbcbcdf", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm-v7" + "file": "buildx-v0.16.0.linux-arm-v7", + "sha256": "81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.15.1.linux-arm64", - "sha256": "13f4ffd2b6922e941d6b6a9faee73ec9b8cab5b309ef90dfadf48142c2a47f34", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-arm64" + "file": "buildx-v0.16.0.linux-arm64", + "sha256": "1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.15.1.linux-ppc64le", - "sha256": "6b41769526c9102d2352ed6900de33ee4be2eaf1927cfb216cc832c718e5c990", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-ppc64le" + "file": "buildx-v0.16.0.linux-ppc64le", + "sha256": "569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.15.1.linux-riscv64", - "sha256": "52f5a974d8d1eb88d1defe0da5173d39df3608e554c3dcd1d45bde77c3d697f3", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-riscv64" + "file": "buildx-v0.16.0.linux-riscv64", + "sha256": "e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.15.1.linux-s390x", - "sha256": "689c88555c42708ac812e3063590f8681b675d7f2ca68c024299ec388963615d", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.linux-s390x" + "file": "buildx-v0.16.0.linux-s390x", + "sha256": "80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.15.1.windows-amd64.exe", - "sha256": "d28cff3df9fdbb37aa7434edb09d8befe5e90e5ef5887807569b694f25bebd33", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-amd64.exe" + "file": "buildx-v0.16.0.windows-amd64.exe", + "sha256": "6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.15.1.windows-arm64.exe", - "sha256": "09bc6cbba9d8b0a07ddfcbd700f27dd9d4c5b1336f47a2e40d3d0e3ead23ebbd", - "url": "https://github.com/docker/buildx/releases/download/v0.15.1/buildx-v0.15.1.windows-arm64.exe" + "file": "buildx-v0.16.0.windows-arm64.exe", + "sha256": "41c724c95f92204a1a8575e1e79b72f4667392090133e71c571c4d2cbfeffa64", + "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-arm64.exe" } }, - "version": "0.15.1" + "version": "0.16.0" }, "compose": { "arches": { From d3f3f4306d56a5295e676cca650159fbbf21d342 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Jul 2024 10:04:16 -0700 Subject: [PATCH 373/667] Update 24 to compose 2.29.0 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 35425a397..5d765464c 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_VERSION 2.29.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64'; \ - sha256='5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64'; \ + sha256='fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6'; \ - sha256='ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6'; \ + sha256='e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7'; \ - sha256='d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7'; \ + sha256='7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64'; \ - sha256='1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64'; \ + sha256='49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le'; \ - sha256='c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le'; \ + sha256='45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64'; \ - sha256='9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64'; \ + sha256='e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x'; \ - sha256='c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x'; \ + sha256='94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index bd644e715..9fcf58b41 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc +ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index a2efbd37a..a7195b8f3 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc +ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 882cfa06b..3f18d5a29 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64" + "sha256": "fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6" + "sha256": "e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7" + "sha256": "7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64" + "sha256": "49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "0c4646a8c12328372cda2e7ca16f16902b7d4824645b42f740b364102ef262b7", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-x86_64" + "sha256": "06d5a3dcd1bcbfd458774a634069a45541de128a9a50a38ffebbb9184edc10b6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5e2a812b7ea4e55f5ff1f6cb4fa908ee74754b6a8a1a36c5959ec8490eeaa35d", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-aarch64" + "sha256": "00cffa2847110a202002a97b661902b2ba984bc9c14ad6e0b323b558415292b2", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le" + "sha256": "45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64" + "sha256": "e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x" + "sha256": "94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe" + "sha256": "3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "99921947df0dc85bac3995492ee6ab0de6aefdea866ef304771071604ed2697f", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-aarch64.exe" + "sha256": "9e240502439ec6560d354780ee14655838be739158f0462da9a6f5f480ad71d6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.28.1" + "version": "2.29.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From a5a4a8100e83d20e491dbcce1648722e0e1302f5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Jul 2024 10:06:21 -0700 Subject: [PATCH 374/667] Update 25 to compose 2.29.0 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index 8fce11f00..cf52451db 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_VERSION 2.29.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64'; \ - sha256='5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64'; \ + sha256='fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6'; \ - sha256='ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6'; \ + sha256='e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7'; \ - sha256='d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7'; \ + sha256='7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64'; \ - sha256='1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64'; \ + sha256='49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le'; \ - sha256='c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le'; \ + sha256='45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64'; \ - sha256='9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64'; \ + sha256='e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x'; \ - sha256='c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x'; \ + sha256='94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 66e55b233..dc6d3c5d4 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc +ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index f29f3cf53..fbd441d7e 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc +ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 3f18d5a29..6e3a1ef47 100644 --- a/versions.json +++ b/versions.json @@ -214,61 +214,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64" + "sha256": "fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6" + "sha256": "e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7" + "sha256": "7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64" + "sha256": "49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "0c4646a8c12328372cda2e7ca16f16902b7d4824645b42f740b364102ef262b7", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-x86_64" + "sha256": "06d5a3dcd1bcbfd458774a634069a45541de128a9a50a38ffebbb9184edc10b6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5e2a812b7ea4e55f5ff1f6cb4fa908ee74754b6a8a1a36c5959ec8490eeaa35d", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-aarch64" + "sha256": "00cffa2847110a202002a97b661902b2ba984bc9c14ad6e0b323b558415292b2", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le" + "sha256": "45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64" + "sha256": "e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x" + "sha256": "94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe" + "sha256": "3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "99921947df0dc85bac3995492ee6ab0de6aefdea866ef304771071604ed2697f", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-aarch64.exe" + "sha256": "9e240502439ec6560d354780ee14655838be739158f0462da9a6f5f480ad71d6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.28.1" + "version": "2.29.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From e403f2b0689355e782dad8b88cdf01a11a0d8381 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Jul 2024 10:08:22 -0700 Subject: [PATCH 375/667] Update 26 to compose 2.29.0 --- 26/cli/Dockerfile | 30 ++++++------ 26/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 11a14b68e..783154476 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_VERSION 2.29.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64'; \ - sha256='5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64'; \ + sha256='fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6'; \ - sha256='ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6'; \ + sha256='e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7'; \ - sha256='d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7'; \ + sha256='7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64'; \ - sha256='1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64'; \ + sha256='49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le'; \ - sha256='c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le'; \ + sha256='45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64'; \ - sha256='9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64'; \ + sha256='e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x'; \ - sha256='c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x'; \ + sha256='94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 7ef67c9b3..24e594dcb 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc +ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 080eda3ef..019a41561 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc +ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6e3a1ef47..6f3582a37 100644 --- a/versions.json +++ b/versions.json @@ -355,61 +355,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64" + "sha256": "fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6" + "sha256": "e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7" + "sha256": "7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64" + "sha256": "49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "0c4646a8c12328372cda2e7ca16f16902b7d4824645b42f740b364102ef262b7", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-x86_64" + "sha256": "06d5a3dcd1bcbfd458774a634069a45541de128a9a50a38ffebbb9184edc10b6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5e2a812b7ea4e55f5ff1f6cb4fa908ee74754b6a8a1a36c5959ec8490eeaa35d", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-aarch64" + "sha256": "00cffa2847110a202002a97b661902b2ba984bc9c14ad6e0b323b558415292b2", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le" + "sha256": "45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64" + "sha256": "e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x" + "sha256": "94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe" + "sha256": "3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "99921947df0dc85bac3995492ee6ab0de6aefdea866ef304771071604ed2697f", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-aarch64.exe" + "sha256": "9e240502439ec6560d354780ee14655838be739158f0462da9a6f5f480ad71d6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.28.1" + "version": "2.29.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 0dab785b0505432eb567e6e50b6b379dbca6eeaf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Jul 2024 10:10:28 -0700 Subject: [PATCH 376/667] Update 27 to compose 2.29.0 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 37fbd0cdf..5d065c5e6 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.28.1 +ENV DOCKER_COMPOSE_VERSION 2.29.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64'; \ - sha256='5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64'; \ + sha256='fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6'; \ - sha256='ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6'; \ + sha256='e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7'; \ - sha256='d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7'; \ + sha256='7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64'; \ - sha256='1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64'; \ + sha256='49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le'; \ - sha256='c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le'; \ + sha256='45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64'; \ - sha256='9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64'; \ + sha256='e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x'; \ - sha256='c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38'; \ + url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x'; \ + sha256='94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index aca47b398..fa6ecf27e 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc +ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index b84187904..4d592ba7a 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.28.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc +ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6f3582a37..933ec3d10 100644 --- a/versions.json +++ b/versions.json @@ -496,61 +496,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "5b480d4f9e3517b375f0fbb781b39c63cec934f44b13c43b8f1d0f22bf6de8c3", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-x86_64" + "sha256": "fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "ff366f16854e8febcdce21b750f6462abdcaa16209be490feaa8c2dd88b7884c", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv6" + "sha256": "e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d829c0d3f85885ee29fcaf19d2b6001215820ad874a0b9cdc3172965acb80c50", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-armv7" + "sha256": "7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "1ce6f9842b10ee5f61218a62f3acfc5839a31cd6daa6e87e926bef63dd9fee20", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-aarch64" + "sha256": "49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "0c4646a8c12328372cda2e7ca16f16902b7d4824645b42f740b364102ef262b7", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-x86_64" + "sha256": "06d5a3dcd1bcbfd458774a634069a45541de128a9a50a38ffebbb9184edc10b6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5e2a812b7ea4e55f5ff1f6cb4fa908ee74754b6a8a1a36c5959ec8490eeaa35d", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-darwin-aarch64" + "sha256": "00cffa2847110a202002a97b661902b2ba984bc9c14ad6e0b323b558415292b2", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "c02e6b718e94df66cd0a53349d6487dbc6da99aa582c0b9906637964ecd9bd15", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-ppc64le" + "sha256": "45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9d5d8033a8cf3deb05c7a9ee7cdf0086cc24a526fa9a10b4a778cc9124f5ef25", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-riscv64" + "sha256": "e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "c8ac20d8fac6d982a83e3b5bb34cda5ac326fbfde9b43c64a290258a1d7fbb38", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-linux-s390x" + "sha256": "94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "7dbd8848d9b8dce489c4d2ce1bb4f4b7a3dccb07a08596ae98b85091e1645bcc", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-x86_64.exe" + "sha256": "3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "99921947df0dc85bac3995492ee6ab0de6aefdea866ef304771071604ed2697f", - "url": "https://github.com/docker/compose/releases/download/v2.28.1/docker-compose-windows-aarch64.exe" + "sha256": "9e240502439ec6560d354780ee14655838be739158f0462da9a6f5f480ad71d6", + "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.28.1" + "version": "2.29.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From e23eebce8242288c988a1491b6b3dfe69e87660c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Jul 2024 15:04:10 -0700 Subject: [PATCH 377/667] Update 24 to buildx 0.16.1 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 5d765464c..6b42e610a 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_VERSION 0.16.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64'; \ - sha256='9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64'; \ + sha256='62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6'; \ - sha256='902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6'; \ + sha256='e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7'; \ - sha256='81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7'; \ + sha256='8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64'; \ - sha256='1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64'; \ + sha256='024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le'; \ - sha256='569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le'; \ + sha256='328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64'; \ - sha256='e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64'; \ + sha256='2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x'; \ - sha256='80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x'; \ + sha256='3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 9fcf58b41..aab618475 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 +ENV DOCKER_BUILDX_VERSION 0.16.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index a7195b8f3..0843135a5 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 +ENV DOCKER_BUILDX_VERSION 0.16.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 933ec3d10..9931db22f 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.16.0.linux-amd64", - "sha256": "9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64" + "file": "buildx-v0.16.1.linux-amd64", + "sha256": "62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.16.0.linux-arm-v6", - "sha256": "902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6" + "file": "buildx-v0.16.1.linux-arm-v6", + "sha256": "e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.16.0.linux-arm-v7", - "sha256": "81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7" + "file": "buildx-v0.16.1.linux-arm-v7", + "sha256": "8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.16.0.linux-arm64", - "sha256": "1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64" + "file": "buildx-v0.16.1.linux-arm64", + "sha256": "024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.16.0.linux-ppc64le", - "sha256": "569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le" + "file": "buildx-v0.16.1.linux-ppc64le", + "sha256": "328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.16.0.linux-riscv64", - "sha256": "e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64" + "file": "buildx-v0.16.1.linux-riscv64", + "sha256": "2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.16.0.linux-s390x", - "sha256": "80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x" + "file": "buildx-v0.16.1.linux-s390x", + "sha256": "3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.16.0.windows-amd64.exe", - "sha256": "6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe" + "file": "buildx-v0.16.1.windows-amd64.exe", + "sha256": "34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.16.0.windows-arm64.exe", - "sha256": "41c724c95f92204a1a8575e1e79b72f4667392090133e71c571c4d2cbfeffa64", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-arm64.exe" + "file": "buildx-v0.16.1.windows-arm64.exe", + "sha256": "1533b0dd26aada59b891e7c94416955ab0e3720d4930438a64df497689fc1155", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.exe" } }, - "version": "0.16.0" + "version": "0.16.1" }, "compose": { "arches": { From 76d8175f8b4ff4fd27c16090be7fcdaf490e4f3d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Jul 2024 15:06:10 -0700 Subject: [PATCH 378/667] Update 25 to buildx 0.16.1 --- 25/cli/Dockerfile | 30 +++++----- 25/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index cf52451db..c16419098 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_VERSION 0.16.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64'; \ - sha256='9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64'; \ + sha256='62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6'; \ - sha256='902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6'; \ + sha256='e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7'; \ - sha256='81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7'; \ + sha256='8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64'; \ - sha256='1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64'; \ + sha256='024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le'; \ - sha256='569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le'; \ + sha256='328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64'; \ - sha256='e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64'; \ + sha256='2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x'; \ - sha256='80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x'; \ + sha256='3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index dc6d3c5d4..75a8b69ca 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 +ENV DOCKER_BUILDX_VERSION 0.16.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index fbd441d7e..36ddd7a95 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 +ENV DOCKER_BUILDX_VERSION 0.16.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 9931db22f..6b6413cfc 100644 --- a/versions.json +++ b/versions.json @@ -163,52 +163,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.16.0.linux-amd64", - "sha256": "9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64" + "file": "buildx-v0.16.1.linux-amd64", + "sha256": "62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.16.0.linux-arm-v6", - "sha256": "902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6" + "file": "buildx-v0.16.1.linux-arm-v6", + "sha256": "e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.16.0.linux-arm-v7", - "sha256": "81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7" + "file": "buildx-v0.16.1.linux-arm-v7", + "sha256": "8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.16.0.linux-arm64", - "sha256": "1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64" + "file": "buildx-v0.16.1.linux-arm64", + "sha256": "024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.16.0.linux-ppc64le", - "sha256": "569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le" + "file": "buildx-v0.16.1.linux-ppc64le", + "sha256": "328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.16.0.linux-riscv64", - "sha256": "e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64" + "file": "buildx-v0.16.1.linux-riscv64", + "sha256": "2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.16.0.linux-s390x", - "sha256": "80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x" + "file": "buildx-v0.16.1.linux-s390x", + "sha256": "3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.16.0.windows-amd64.exe", - "sha256": "6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe" + "file": "buildx-v0.16.1.windows-amd64.exe", + "sha256": "34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.16.0.windows-arm64.exe", - "sha256": "41c724c95f92204a1a8575e1e79b72f4667392090133e71c571c4d2cbfeffa64", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-arm64.exe" + "file": "buildx-v0.16.1.windows-arm64.exe", + "sha256": "1533b0dd26aada59b891e7c94416955ab0e3720d4930438a64df497689fc1155", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.exe" } }, - "version": "0.16.0" + "version": "0.16.1" }, "compose": { "arches": { From 7b3d2fd09745c5bf9e4010781fce12c031b2ffc5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Jul 2024 15:08:42 -0700 Subject: [PATCH 379/667] Update 26 to buildx 0.16.1 --- 26/cli/Dockerfile | 30 +++++----- 26/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 783154476..562232a8a 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_VERSION 0.16.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64'; \ - sha256='9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64'; \ + sha256='62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6'; \ - sha256='902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6'; \ + sha256='e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7'; \ - sha256='81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7'; \ + sha256='8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64'; \ - sha256='1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64'; \ + sha256='024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le'; \ - sha256='569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le'; \ + sha256='328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64'; \ - sha256='e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64'; \ + sha256='2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x'; \ - sha256='80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x'; \ + sha256='3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 24e594dcb..8ae32a710 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 +ENV DOCKER_BUILDX_VERSION 0.16.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 019a41561..386c6c33b 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 +ENV DOCKER_BUILDX_VERSION 0.16.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6b6413cfc..7d8649c68 100644 --- a/versions.json +++ b/versions.json @@ -304,52 +304,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.16.0.linux-amd64", - "sha256": "9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64" + "file": "buildx-v0.16.1.linux-amd64", + "sha256": "62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.16.0.linux-arm-v6", - "sha256": "902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6" + "file": "buildx-v0.16.1.linux-arm-v6", + "sha256": "e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.16.0.linux-arm-v7", - "sha256": "81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7" + "file": "buildx-v0.16.1.linux-arm-v7", + "sha256": "8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.16.0.linux-arm64", - "sha256": "1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64" + "file": "buildx-v0.16.1.linux-arm64", + "sha256": "024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.16.0.linux-ppc64le", - "sha256": "569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le" + "file": "buildx-v0.16.1.linux-ppc64le", + "sha256": "328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.16.0.linux-riscv64", - "sha256": "e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64" + "file": "buildx-v0.16.1.linux-riscv64", + "sha256": "2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.16.0.linux-s390x", - "sha256": "80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x" + "file": "buildx-v0.16.1.linux-s390x", + "sha256": "3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.16.0.windows-amd64.exe", - "sha256": "6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe" + "file": "buildx-v0.16.1.windows-amd64.exe", + "sha256": "34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.16.0.windows-arm64.exe", - "sha256": "41c724c95f92204a1a8575e1e79b72f4667392090133e71c571c4d2cbfeffa64", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-arm64.exe" + "file": "buildx-v0.16.1.windows-arm64.exe", + "sha256": "1533b0dd26aada59b891e7c94416955ab0e3720d4930438a64df497689fc1155", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.exe" } }, - "version": "0.16.0" + "version": "0.16.1" }, "compose": { "arches": { From 694a68ce537163d0d6054e51fe64d8c7b350c9db Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Jul 2024 15:11:22 -0700 Subject: [PATCH 380/667] Update 27 to buildx 0.16.1 --- 27/cli/Dockerfile | 30 +++++----- 27/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 5d065c5e6..7dba2ff4f 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.16.0 +ENV DOCKER_BUILDX_VERSION 0.16.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64'; \ - sha256='9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64'; \ + sha256='62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6'; \ - sha256='902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6'; \ + sha256='e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7'; \ - sha256='81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7'; \ + sha256='8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64'; \ - sha256='1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64'; \ + sha256='024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le'; \ - sha256='569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le'; \ + sha256='328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64'; \ - sha256='e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64'; \ + sha256='2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x'; \ - sha256='80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x'; \ + sha256='3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index fa6ecf27e..a43fb8097 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 +ENV DOCKER_BUILDX_VERSION 0.16.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 4d592ba7a..500a494a5 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025 +ENV DOCKER_BUILDX_VERSION 0.16.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 7d8649c68..d1b2df27d 100644 --- a/versions.json +++ b/versions.json @@ -445,52 +445,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.16.0.linux-amd64", - "sha256": "9a9a6ca0b929a57db01020fb226b1a2ea2bc57eba63d4adec46c43d0009506e2", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-amd64" + "file": "buildx-v0.16.1.linux-amd64", + "sha256": "62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.16.0.linux-arm-v6", - "sha256": "902f1240a6071c721f9746f0ff0859ef7b7368b683e322c08a1daa92d61d698a", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v6" + "file": "buildx-v0.16.1.linux-arm-v6", + "sha256": "e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.16.0.linux-arm-v7", - "sha256": "81d53f05d1d02306844f5a364cae6d7ad24451497c171ee29e1c000a78f30c5c", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm-v7" + "file": "buildx-v0.16.1.linux-arm-v7", + "sha256": "8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.16.0.linux-arm64", - "sha256": "1aa8f0438866c706654a6dd96e211e509d42b16b1a0e66c1777c95edb2f14f49", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-arm64" + "file": "buildx-v0.16.1.linux-arm64", + "sha256": "024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.16.0.linux-ppc64le", - "sha256": "569f4a47bca797385eccac18e14e1d4bb681e35eeff6304c432de5bcd543120d", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-ppc64le" + "file": "buildx-v0.16.1.linux-ppc64le", + "sha256": "328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.16.0.linux-riscv64", - "sha256": "e0cfc5072a792088115560e77a8540c9bf8299716984d42adc0735161472f076", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-riscv64" + "file": "buildx-v0.16.1.linux-riscv64", + "sha256": "2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.16.0.linux-s390x", - "sha256": "80ff8dcddbc3d0306e5cb819eddf89ce970ea1dbf806eb0adf7b6cd616d1da63", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.linux-s390x" + "file": "buildx-v0.16.1.linux-s390x", + "sha256": "3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.16.0.windows-amd64.exe", - "sha256": "6521f85836e4bdc1347b38b9de32268ac09987e2c1ea0e424b0e07632ab61025", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-amd64.exe" + "file": "buildx-v0.16.1.windows-amd64.exe", + "sha256": "34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.16.0.windows-arm64.exe", - "sha256": "41c724c95f92204a1a8575e1e79b72f4667392090133e71c571c4d2cbfeffa64", - "url": "https://github.com/docker/buildx/releases/download/v0.16.0/buildx-v0.16.0.windows-arm64.exe" + "file": "buildx-v0.16.1.windows-arm64.exe", + "sha256": "1533b0dd26aada59b891e7c94416955ab0e3720d4930438a64df497689fc1155", + "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.exe" } }, - "version": "0.16.0" + "version": "0.16.1" }, "compose": { "arches": { From fc40408b3cda03b569d976adcf8ac4654be1c542 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 22 Jul 2024 10:04:48 -0700 Subject: [PATCH 381/667] Update 27 to 27.1.0 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 7dba2ff4f..805c39b0f 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.0.3 +ENV DOCKER_VERSION 27.1.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.1.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index eb1d5ddc9..51988f7d1 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index 1ac26045b..bfea6fe42 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.1.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index a43fb8097..a37f45595 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.0.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.3.zip +ENV DOCKER_VERSION 27.1.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.0.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 500a494a5..52c308859 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.0.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.3.zip +ENV DOCKER_VERSION 27.1.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.0.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/versions.json b/versions.json index d1b2df27d..a202ec9d2 100644 --- a/versions.json +++ b/versions.json @@ -425,21 +425,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.0.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.1.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.1.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.1.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.1.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.0.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.1.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.0.3.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.1.0.zip" } }, "buildx": { @@ -560,7 +560,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.0.3" + "version": "27.1.0" }, "27-rc": null } From 45294e1500cbbad6a2d52126f9d2c3e8dc9e86f5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 23 Jul 2024 10:04:14 -0700 Subject: [PATCH 382/667] Update 24 to compose 2.29.1 --- 24/cli/Dockerfile | 30 ++++++------ 24/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 6b42e610a..40162cc85 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_VERSION 2.29.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64'; \ - sha256='fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64'; \ + sha256='5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6'; \ - sha256='e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6'; \ + sha256='5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7'; \ - sha256='7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7'; \ + sha256='0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64'; \ - sha256='49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64'; \ + sha256='7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le'; \ - sha256='45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le'; \ + sha256='9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64'; \ - sha256='e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64'; \ + sha256='91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x'; \ - sha256='94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x'; \ + sha256='1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index aab618475..97c53f7cf 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 +ENV DOCKER_COMPOSE_VERSION 2.29.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 0843135a5..888882cdd 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 +ENV DOCKER_COMPOSE_VERSION 2.29.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index a202ec9d2..3dd0d551e 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64" + "sha256": "5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6" + "sha256": "5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7" + "sha256": "0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64" + "sha256": "7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "06d5a3dcd1bcbfd458774a634069a45541de128a9a50a38ffebbb9184edc10b6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-x86_64" + "sha256": "170acf9a5754ec244904fb63494c50249ba4aea22d84c1fad9a9eeadc8c87c66", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "00cffa2847110a202002a97b661902b2ba984bc9c14ad6e0b323b558415292b2", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-aarch64" + "sha256": "b4a5b264ecddeeced9c14116e1b726c6529f286bea0a14325fb6436a4b35d7ec", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le" + "sha256": "9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64" + "sha256": "91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x" + "sha256": "1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe" + "sha256": "c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "9e240502439ec6560d354780ee14655838be739158f0462da9a6f5f480ad71d6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-aarch64.exe" + "sha256": "de8fe58e1ae5330597267499c2ee818ec11d5ca05ef00c29697c1cff4abcacbf", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.0" + "version": "2.29.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 06b497cebd8daa389434d12bbacc00fdbefbe3fe Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 23 Jul 2024 10:05:57 -0700 Subject: [PATCH 383/667] Update 25 to compose 2.29.1 --- 25/cli/Dockerfile | 30 ++++++------ 25/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index c16419098..b86fd33fa 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_VERSION 2.29.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64'; \ - sha256='fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64'; \ + sha256='5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6'; \ - sha256='e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6'; \ + sha256='5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7'; \ - sha256='7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7'; \ + sha256='0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64'; \ - sha256='49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64'; \ + sha256='7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le'; \ - sha256='45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le'; \ + sha256='9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64'; \ - sha256='e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64'; \ + sha256='91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x'; \ - sha256='94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x'; \ + sha256='1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 75a8b69ca..5ae89415c 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 +ENV DOCKER_COMPOSE_VERSION 2.29.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index 36ddd7a95..a6c6ae864 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 +ENV DOCKER_COMPOSE_VERSION 2.29.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 3dd0d551e..8fd038c3d 100644 --- a/versions.json +++ b/versions.json @@ -214,61 +214,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64" + "sha256": "5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6" + "sha256": "5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7" + "sha256": "0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64" + "sha256": "7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "06d5a3dcd1bcbfd458774a634069a45541de128a9a50a38ffebbb9184edc10b6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-x86_64" + "sha256": "170acf9a5754ec244904fb63494c50249ba4aea22d84c1fad9a9eeadc8c87c66", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "00cffa2847110a202002a97b661902b2ba984bc9c14ad6e0b323b558415292b2", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-aarch64" + "sha256": "b4a5b264ecddeeced9c14116e1b726c6529f286bea0a14325fb6436a4b35d7ec", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le" + "sha256": "9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64" + "sha256": "91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x" + "sha256": "1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe" + "sha256": "c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "9e240502439ec6560d354780ee14655838be739158f0462da9a6f5f480ad71d6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-aarch64.exe" + "sha256": "de8fe58e1ae5330597267499c2ee818ec11d5ca05ef00c29697c1cff4abcacbf", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.0" + "version": "2.29.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From fa327fa3796638b29faee017e8ebb30e94e4428f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 23 Jul 2024 10:07:33 -0700 Subject: [PATCH 384/667] Update 26 to compose 2.29.1 --- 26/cli/Dockerfile | 30 ++++++------ 26/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile index 562232a8a..8b1ffe303 100644 --- a/26/cli/Dockerfile +++ b/26/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_VERSION 2.29.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64'; \ - sha256='fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64'; \ + sha256='5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6'; \ - sha256='e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6'; \ + sha256='5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7'; \ - sha256='7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7'; \ + sha256='0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64'; \ - sha256='49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64'; \ + sha256='7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le'; \ - sha256='45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le'; \ + sha256='9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64'; \ - sha256='e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64'; \ + sha256='91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x'; \ - sha256='94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x'; \ + sha256='1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile index 8ae32a710..01b3e5c1c 100644 --- a/26/windows/windowsservercore-1809/Dockerfile +++ b/26/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 +ENV DOCKER_COMPOSE_VERSION 2.29.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index 386c6c33b..d9bd360f2 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 +ENV DOCKER_COMPOSE_VERSION 2.29.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 8fd038c3d..095b502e6 100644 --- a/versions.json +++ b/versions.json @@ -355,61 +355,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64" + "sha256": "5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6" + "sha256": "5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7" + "sha256": "0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64" + "sha256": "7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "06d5a3dcd1bcbfd458774a634069a45541de128a9a50a38ffebbb9184edc10b6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-x86_64" + "sha256": "170acf9a5754ec244904fb63494c50249ba4aea22d84c1fad9a9eeadc8c87c66", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "00cffa2847110a202002a97b661902b2ba984bc9c14ad6e0b323b558415292b2", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-aarch64" + "sha256": "b4a5b264ecddeeced9c14116e1b726c6529f286bea0a14325fb6436a4b35d7ec", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le" + "sha256": "9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64" + "sha256": "91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x" + "sha256": "1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe" + "sha256": "c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "9e240502439ec6560d354780ee14655838be739158f0462da9a6f5f480ad71d6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-aarch64.exe" + "sha256": "de8fe58e1ae5330597267499c2ee818ec11d5ca05ef00c29697c1cff4abcacbf", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.0" + "version": "2.29.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 2c1cfef01f21207c927d6fc4463a3468cd878f4c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 23 Jul 2024 10:09:06 -0700 Subject: [PATCH 385/667] Update 27 to compose 2.29.1 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 805c39b0f..9344fb51d 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.0 +ENV DOCKER_COMPOSE_VERSION 2.29.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64'; \ - sha256='fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64'; \ + sha256='5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6'; \ - sha256='e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6'; \ + sha256='5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7'; \ - sha256='7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7'; \ + sha256='0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64'; \ - sha256='49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64'; \ + sha256='7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le'; \ - sha256='45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le'; \ + sha256='9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64'; \ - sha256='e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64'; \ + sha256='91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x'; \ - sha256='94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c'; \ + url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x'; \ + sha256='1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index a37f45595..8e6daa9b5 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 +ENV DOCKER_COMPOSE_VERSION 2.29.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 52c308859..50eefaff8 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65 +ENV DOCKER_COMPOSE_VERSION 2.29.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 095b502e6..d197700b8 100644 --- a/versions.json +++ b/versions.json @@ -496,61 +496,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "fb3f6c317056ec54e8756851663ca788521f7a9c60afb8a595bc7a05ffaa8951", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-x86_64" + "sha256": "5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e1f2942bff7e16556675e46db6e30d6ecbed2e78656c760b8e25383817b7a328", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv6" + "sha256": "5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "7ca096778a30c349816f67ce772709164eddaf3022901bf55472ae3134264cf6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-armv7" + "sha256": "0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "49941418051846d72c74dd8df1f8b4ff753ca74d29986361d937384fbfb63569", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-aarch64" + "sha256": "7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "06d5a3dcd1bcbfd458774a634069a45541de128a9a50a38ffebbb9184edc10b6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-x86_64" + "sha256": "170acf9a5754ec244904fb63494c50249ba4aea22d84c1fad9a9eeadc8c87c66", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "00cffa2847110a202002a97b661902b2ba984bc9c14ad6e0b323b558415292b2", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-darwin-aarch64" + "sha256": "b4a5b264ecddeeced9c14116e1b726c6529f286bea0a14325fb6436a4b35d7ec", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "45606de42e140e20eadb7f8a9db62f783de7df6c148640cd67cf8f9ef3aaab99", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-ppc64le" + "sha256": "9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e685bb6ad60225dc099acf85cfbb928e5ceef26a1a61f4995d1fbabac438d0e2", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-riscv64" + "sha256": "91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "94622d0476d9f59b40c24daa22231c603a93fd9acc984c4427ca946dfb4a908c", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-linux-s390x" + "sha256": "1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "3dc98cacf0e0a05d8a714cc729827c062ff7ec13ffcd626e7b3767b362ce9b65", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-x86_64.exe" + "sha256": "c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "9e240502439ec6560d354780ee14655838be739158f0462da9a6f5f480ad71d6", - "url": "https://github.com/docker/compose/releases/download/v2.29.0/docker-compose-windows-aarch64.exe" + "sha256": "de8fe58e1ae5330597267499c2ee818ec11d5ca05ef00c29697c1cff4abcacbf", + "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.0" + "version": "2.29.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From bbf61df6eeacb77c1ecbd3b9c6c874c4e8918b84 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 23 Jul 2024 15:56:51 -0700 Subject: [PATCH 386/667] Update 27 to 27.1.1 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 9344fb51d..3cdf3182a 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.1.0 +ENV DOCKER_VERSION 27.1.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.1.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index 51988f7d1..16c59938e 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index bfea6fe42..d2f7a4fd2 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.1.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 8e6daa9b5..1e8f667c3 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.1.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.0.zip +ENV DOCKER_VERSION 27.1.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.1.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 50eefaff8..07d561701 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.1.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.0.zip +ENV DOCKER_VERSION 27.1.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.1.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/versions.json b/versions.json index d197700b8..23282a39b 100644 --- a/versions.json +++ b/versions.json @@ -425,21 +425,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.1.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.1.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.1.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.1.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.1.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.1.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.1.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.1.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.1.1.zip" } }, "buildx": { @@ -560,7 +560,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.1.0" + "version": "27.1.1" }, "27-rc": null } From 3b9c6eaa290cb4a3f54179a27dcd9036971a6bb4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Jul 2024 10:04:14 -0700 Subject: [PATCH 387/667] Update 24 to buildx 0.16.2 --- 24/cli/Dockerfile | 30 +++++----- 24/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile index 40162cc85..2a74c87ae 100644 --- a/24/cli/Dockerfile +++ b/24/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.16.1 +ENV DOCKER_BUILDX_VERSION 0.16.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64'; \ - sha256='62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64'; \ + sha256='43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6'; \ - sha256='e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6'; \ + sha256='77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7'; \ - sha256='8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7'; \ + sha256='b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64'; \ - sha256='024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64'; \ + sha256='775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le'; \ - sha256='328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le'; \ + sha256='956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64'; \ - sha256='2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64'; \ + sha256='e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x'; \ - sha256='3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x'; \ + sha256='f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile index 97c53f7cf..7870f77e0 100644 --- a/24/windows/windowsservercore-1809/Dockerfile +++ b/24/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 +ENV DOCKER_BUILDX_VERSION 0.16.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile index 888882cdd..34d07b705 100644 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ b/24/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 +ENV DOCKER_BUILDX_VERSION 0.16.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 23282a39b..e2f073c11 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.16.1.linux-amd64", - "sha256": "62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64" + "file": "buildx-v0.16.2.linux-amd64", + "sha256": "43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.16.1.linux-arm-v6", - "sha256": "e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6" + "file": "buildx-v0.16.2.linux-arm-v6", + "sha256": "77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.16.1.linux-arm-v7", - "sha256": "8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7" + "file": "buildx-v0.16.2.linux-arm-v7", + "sha256": "b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.16.1.linux-arm64", - "sha256": "024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64" + "file": "buildx-v0.16.2.linux-arm64", + "sha256": "775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.16.1.linux-ppc64le", - "sha256": "328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le" + "file": "buildx-v0.16.2.linux-ppc64le", + "sha256": "956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.16.1.linux-riscv64", - "sha256": "2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64" + "file": "buildx-v0.16.2.linux-riscv64", + "sha256": "e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.16.1.linux-s390x", - "sha256": "3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x" + "file": "buildx-v0.16.2.linux-s390x", + "sha256": "f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.16.1.windows-amd64.exe", - "sha256": "34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe" + "file": "buildx-v0.16.2.windows-amd64.exe", + "sha256": "0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.16.1.windows-arm64.exe", - "sha256": "1533b0dd26aada59b891e7c94416955ab0e3720d4930438a64df497689fc1155", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.exe" + "file": "buildx-v0.16.2.windows-arm64.exe", + "sha256": "2a79b06bbe0f557e271cb10182d4bcb54c7af68b8e2375ee9b67053b892cab5a", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-arm64.exe" } }, - "version": "0.16.1" + "version": "0.16.2" }, "compose": { "arches": { From ad85990a80623b66f91fb7e8f3ef3fa1f3f9c187 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Jul 2024 10:05:52 -0700 Subject: [PATCH 388/667] Update 25 to buildx 0.16.2 --- 25/cli/Dockerfile | 30 +++++----- 25/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile index b86fd33fa..978b8925a 100644 --- a/25/cli/Dockerfile +++ b/25/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.16.1 +ENV DOCKER_BUILDX_VERSION 0.16.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64'; \ - sha256='62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64'; \ + sha256='43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6'; \ - sha256='e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6'; \ + sha256='77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7'; \ - sha256='8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7'; \ + sha256='b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64'; \ - sha256='024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64'; \ + sha256='775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le'; \ - sha256='328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le'; \ + sha256='956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64'; \ - sha256='2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64'; \ + sha256='e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x'; \ - sha256='3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x'; \ + sha256='f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile index 5ae89415c..4f6401911 100644 --- a/25/windows/windowsservercore-1809/Dockerfile +++ b/25/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 +ENV DOCKER_BUILDX_VERSION 0.16.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile index a6c6ae864..b9ebef0c5 100644 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 +ENV DOCKER_BUILDX_VERSION 0.16.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index e2f073c11..5fbe0f971 100644 --- a/versions.json +++ b/versions.json @@ -163,52 +163,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.16.1.linux-amd64", - "sha256": "62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64" + "file": "buildx-v0.16.2.linux-amd64", + "sha256": "43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.16.1.linux-arm-v6", - "sha256": "e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6" + "file": "buildx-v0.16.2.linux-arm-v6", + "sha256": "77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.16.1.linux-arm-v7", - "sha256": "8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7" + "file": "buildx-v0.16.2.linux-arm-v7", + "sha256": "b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.16.1.linux-arm64", - "sha256": "024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64" + "file": "buildx-v0.16.2.linux-arm64", + "sha256": "775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.16.1.linux-ppc64le", - "sha256": "328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le" + "file": "buildx-v0.16.2.linux-ppc64le", + "sha256": "956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.16.1.linux-riscv64", - "sha256": "2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64" + "file": "buildx-v0.16.2.linux-riscv64", + "sha256": "e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.16.1.linux-s390x", - "sha256": "3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x" + "file": "buildx-v0.16.2.linux-s390x", + "sha256": "f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.16.1.windows-amd64.exe", - "sha256": "34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe" + "file": "buildx-v0.16.2.windows-amd64.exe", + "sha256": "0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.16.1.windows-arm64.exe", - "sha256": "1533b0dd26aada59b891e7c94416955ab0e3720d4930438a64df497689fc1155", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.exe" + "file": "buildx-v0.16.2.windows-arm64.exe", + "sha256": "2a79b06bbe0f557e271cb10182d4bcb54c7af68b8e2375ee9b67053b892cab5a", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-arm64.exe" } }, - "version": "0.16.1" + "version": "0.16.2" }, "compose": { "arches": { From 7447127c9f8d3e7087d71f3b15aced8fd624ea39 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Jul 2024 10:07:34 -0700 Subject: [PATCH 389/667] Update 27 to buildx 0.16.2 --- 27/cli/Dockerfile | 30 +++++----- 27/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 3cdf3182a..06c2912b4 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.16.1 +ENV DOCKER_BUILDX_VERSION 0.16.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64'; \ - sha256='62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64'; \ + sha256='43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6'; \ - sha256='e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6'; \ + sha256='77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7'; \ - sha256='8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7'; \ + sha256='b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64'; \ - sha256='024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64'; \ + sha256='775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le'; \ - sha256='328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le'; \ + sha256='956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64'; \ - sha256='2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64'; \ + sha256='e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x'; \ - sha256='3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230'; \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x'; \ + sha256='f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 1e8f667c3..969d277cf 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 +ENV DOCKER_BUILDX_VERSION 0.16.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 07d561701..b0d2de2ad 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 +ENV DOCKER_BUILDX_VERSION 0.16.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 5fbe0f971..87cbc3bed 100644 --- a/versions.json +++ b/versions.json @@ -445,52 +445,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.16.1.linux-amd64", - "sha256": "62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64" + "file": "buildx-v0.16.2.linux-amd64", + "sha256": "43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.16.1.linux-arm-v6", - "sha256": "e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6" + "file": "buildx-v0.16.2.linux-arm-v6", + "sha256": "77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.16.1.linux-arm-v7", - "sha256": "8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7" + "file": "buildx-v0.16.2.linux-arm-v7", + "sha256": "b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.16.1.linux-arm64", - "sha256": "024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64" + "file": "buildx-v0.16.2.linux-arm64", + "sha256": "775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.16.1.linux-ppc64le", - "sha256": "328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le" + "file": "buildx-v0.16.2.linux-ppc64le", + "sha256": "956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.16.1.linux-riscv64", - "sha256": "2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64" + "file": "buildx-v0.16.2.linux-riscv64", + "sha256": "e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.16.1.linux-s390x", - "sha256": "3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x" + "file": "buildx-v0.16.2.linux-s390x", + "sha256": "f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.16.1.windows-amd64.exe", - "sha256": "34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe" + "file": "buildx-v0.16.2.windows-amd64.exe", + "sha256": "0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.16.1.windows-arm64.exe", - "sha256": "1533b0dd26aada59b891e7c94416955ab0e3720d4930438a64df497689fc1155", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.exe" + "file": "buildx-v0.16.2.windows-arm64.exe", + "sha256": "2a79b06bbe0f557e271cb10182d4bcb54c7af68b8e2375ee9b67053b892cab5a", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-arm64.exe" } }, - "version": "0.16.1" + "version": "0.16.2" }, "compose": { "arches": { From 5084052137ee16215a00f7ed1907b9fddc2a787b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 30 Jul 2024 11:51:53 -0700 Subject: [PATCH 390/667] Remove versions that won't get more Docker, Inc builds See https://github.com/moby/moby/blob/89bca301be72080cd8c948f76ff7818b85268975/project/BRANCHES-AND-TAGS.md --- 24/cli/Dockerfile | 167 ------- 24/cli/docker-entrypoint.sh | 61 --- 24/cli/modprobe.sh | 20 - 24/dind-rootless/Dockerfile | 55 --- 24/dind/Dockerfile | 108 ----- 24/dind/dockerd-entrypoint.sh | 234 ---------- 24/windows/windowsservercore-1809/Dockerfile | 91 ---- .../windowsservercore-ltsc2022/Dockerfile | 91 ---- 25/cli/Dockerfile | 167 ------- 25/cli/docker-entrypoint.sh | 61 --- 25/cli/modprobe.sh | 20 - 25/dind-rootless/Dockerfile | 55 --- 25/dind/Dockerfile | 108 ----- 25/dind/dockerd-entrypoint.sh | 234 ---------- 25/windows/windowsservercore-1809/Dockerfile | 91 ---- .../windowsservercore-ltsc2022/Dockerfile | 91 ---- 26/cli/Dockerfile | 167 ------- 26/cli/docker-entrypoint.sh | 61 --- 26/cli/modprobe.sh | 20 - 26/dind-rootless/Dockerfile | 55 --- 26/dind/Dockerfile | 108 ----- 26/dind/dockerd-entrypoint.sh | 234 ---------- 26/windows/windowsservercore-1809/Dockerfile | 91 ---- .../windowsservercore-ltsc2022/Dockerfile | 91 ---- generate-stackbrew-library.sh | 6 - versions.json | 423 ------------------ 26 files changed, 2910 deletions(-) delete mode 100644 24/cli/Dockerfile delete mode 100755 24/cli/docker-entrypoint.sh delete mode 100755 24/cli/modprobe.sh delete mode 100644 24/dind-rootless/Dockerfile delete mode 100644 24/dind/Dockerfile delete mode 100755 24/dind/dockerd-entrypoint.sh delete mode 100644 24/windows/windowsservercore-1809/Dockerfile delete mode 100644 24/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 25/cli/Dockerfile delete mode 100755 25/cli/docker-entrypoint.sh delete mode 100755 25/cli/modprobe.sh delete mode 100644 25/dind-rootless/Dockerfile delete mode 100644 25/dind/Dockerfile delete mode 100755 25/dind/dockerd-entrypoint.sh delete mode 100644 25/windows/windowsservercore-1809/Dockerfile delete mode 100644 25/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 26/cli/Dockerfile delete mode 100755 26/cli/docker-entrypoint.sh delete mode 100755 26/cli/modprobe.sh delete mode 100644 26/dind-rootless/Dockerfile delete mode 100644 26/dind/Dockerfile delete mode 100755 26/dind/dockerd-entrypoint.sh delete mode 100644 26/windows/windowsservercore-1809/Dockerfile delete mode 100644 26/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/24/cli/Dockerfile b/24/cli/Dockerfile deleted file mode 100644 index 2a74c87ae..000000000 --- a/24/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.20 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 24.0.9 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.9.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.9.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.9.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.9.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.16.2 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64'; \ - sha256='43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6'; \ - sha256='77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7'; \ - sha256='b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64'; \ - sha256='775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le'; \ - sha256='956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64'; \ - sha256='e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x'; \ - sha256='f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.29.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64'; \ - sha256='5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6'; \ - sha256='5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7'; \ - sha256='0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64'; \ - sha256='7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le'; \ - sha256='9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64'; \ - sha256='91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x'; \ - sha256='1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/24/cli/docker-entrypoint.sh b/24/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/24/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/24/cli/modprobe.sh b/24/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/24/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/24/dind-rootless/Dockerfile b/24/dind-rootless/Dockerfile deleted file mode 100644 index e105f64e4..000000000 --- a/24/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:24-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -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-24.0.9.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.9.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/24/dind/Dockerfile b/24/dind/Dockerfile deleted file mode 100644 index ab0aa3da9..000000000 --- a/24/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:24-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 - b="/sbin/${f/tables/tables-legacy}"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.9.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-24.0.9.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.9.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.9.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:24-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/24/dind/dockerd-entrypoint.sh b/24/dind/dockerd-entrypoint.sh deleted file mode 100755 index 6c06bb811..000000000 --- a/24/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/24/windows/windowsservercore-1809/Dockerfile b/24/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 7870f77e0..000000000 --- a/24/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 24.0.9 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.9.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/24/windows/windowsservercore-ltsc2022/Dockerfile b/24/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 34d07b705..000000000 --- a/24/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 24.0.9 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.9.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/25/cli/Dockerfile b/25/cli/Dockerfile deleted file mode 100644 index 978b8925a..000000000 --- a/25/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.20 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 25.0.5 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.5.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.5.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.5.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.5.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.16.2 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64'; \ - sha256='43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6'; \ - sha256='77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7'; \ - sha256='b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64'; \ - sha256='775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le'; \ - sha256='956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64'; \ - sha256='e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x'; \ - sha256='f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.29.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64'; \ - sha256='5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6'; \ - sha256='5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7'; \ - sha256='0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64'; \ - sha256='7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le'; \ - sha256='9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64'; \ - sha256='91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x'; \ - sha256='1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/25/cli/docker-entrypoint.sh b/25/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/25/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/25/cli/modprobe.sh b/25/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/25/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/25/dind-rootless/Dockerfile b/25/dind-rootless/Dockerfile deleted file mode 100644 index 7023e591c..000000000 --- a/25/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:25-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -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-25.0.5.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.5.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/25/dind/Dockerfile b/25/dind/Dockerfile deleted file mode 100644 index 4b836621f..000000000 --- a/25/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:25-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 - b="/sbin/${f/tables/tables-legacy}"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.5.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-25.0.5.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.5.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.5.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:25-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/25/dind/dockerd-entrypoint.sh b/25/dind/dockerd-entrypoint.sh deleted file mode 100755 index 6c06bb811..000000000 --- a/25/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/25/windows/windowsservercore-1809/Dockerfile b/25/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 4f6401911..000000000 --- a/25/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 25.0.5 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.5.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/25/windows/windowsservercore-ltsc2022/Dockerfile b/25/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index b9ebef0c5..000000000 --- a/25/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 25.0.5 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.5.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/26/cli/Dockerfile b/26/cli/Dockerfile deleted file mode 100644 index 8b1ffe303..000000000 --- a/26/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.20 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 26.1.4 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.4.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.1.4.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.4.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.4.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.16.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64'; \ - sha256='62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6'; \ - sha256='e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7'; \ - sha256='8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64'; \ - sha256='024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le'; \ - sha256='328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64'; \ - sha256='2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x'; \ - sha256='3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.29.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64'; \ - sha256='5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6'; \ - sha256='5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7'; \ - sha256='0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64'; \ - sha256='7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le'; \ - sha256='9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64'; \ - sha256='91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x'; \ - sha256='1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/26/cli/docker-entrypoint.sh b/26/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/26/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/26/cli/modprobe.sh b/26/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/26/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/26/dind-rootless/Dockerfile b/26/dind-rootless/Dockerfile deleted file mode 100644 index d176fdbae..000000000 --- a/26/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:26-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -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-26.1.4.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.4.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/26/dind/Dockerfile b/26/dind/Dockerfile deleted file mode 100644 index 7698d1ecc..000000000 --- a/26/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:26-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 - b="/sbin/${f/tables/tables-legacy}"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.4.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-26.1.4.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.4.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.4.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:26-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/26/dind/dockerd-entrypoint.sh b/26/dind/dockerd-entrypoint.sh deleted file mode 100755 index 6c06bb811..000000000 --- a/26/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/26/windows/windowsservercore-1809/Dockerfile b/26/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 01b3e5c1c..000000000 --- a/26/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 26.1.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index d9bd360f2..000000000 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 26.1.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index bbc69c838..11e3c9199 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -175,12 +175,6 @@ for version; do suiteAliases=( "${suiteAliases[@]//latest-/}" ) variantAliases+=( "${suiteAliases[@]}" ) if [ "$variant" = 'dind' ]; then - # add "git" aliases https://github.com/docker-library/docker/issues/482#issuecomment-1955609423 - if [ "$version" = '24' ] || [ "$version" = '25' ]; then - gitAliases=( "${versionAliases[@]/%/-git}" ) - gitAliases=( "${gitAliases[@]//latest-/}" ) - variantAliases+=( "${gitAliases[@]}" ) - fi # add "latest" aliases suiteAliases=( "${versionAliases[0]}" ) # only "X.Y.Z-foo" suiteAliases=( "${suiteAliases[@]/%/-alpine$alpine}" ) diff --git a/versions.json b/versions.json index 87cbc3bed..fbce3c87a 100644 --- a/versions.json +++ b/versions.json @@ -1,427 +1,4 @@ { - "24": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-24.0.9.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.9.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-24.0.9.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-24.0.9.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-24.0.9.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.9.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-24.0.9.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.16.2.linux-amd64", - "sha256": "43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.16.2.linux-arm-v6", - "sha256": "77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.16.2.linux-arm-v7", - "sha256": "b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.16.2.linux-arm64", - "sha256": "775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64" - }, - "ppc64le": { - "file": "buildx-v0.16.2.linux-ppc64le", - "sha256": "956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.16.2.linux-riscv64", - "sha256": "e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.16.2.linux-s390x", - "sha256": "f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.16.2.windows-amd64.exe", - "sha256": "0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.16.2.windows-arm64.exe", - "sha256": "2a79b06bbe0f557e271cb10182d4bcb54c7af68b8e2375ee9b67053b892cab5a", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-arm64.exe" - } - }, - "version": "0.16.2" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "170acf9a5754ec244904fb63494c50249ba4aea22d84c1fad9a9eeadc8c87c66", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "b4a5b264ecddeeced9c14116e1b726c6529f286bea0a14325fb6436a4b35d7ec", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "de8fe58e1ae5330597267499c2ee818ec11d5ca05ef00c29697c1cff4abcacbf", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.29.1" - }, - "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "24.0.9" - }, - "24-rc": null, - "25": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-25.0.5.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-25.0.5.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-25.0.5.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-25.0.5.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-25.0.5.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-25.0.5.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-25.0.5.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.16.2.linux-amd64", - "sha256": "43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.16.2.linux-arm-v6", - "sha256": "77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.16.2.linux-arm-v7", - "sha256": "b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.16.2.linux-arm64", - "sha256": "775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64" - }, - "ppc64le": { - "file": "buildx-v0.16.2.linux-ppc64le", - "sha256": "956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.16.2.linux-riscv64", - "sha256": "e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.16.2.linux-s390x", - "sha256": "f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.16.2.windows-amd64.exe", - "sha256": "0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.16.2.windows-arm64.exe", - "sha256": "2a79b06bbe0f557e271cb10182d4bcb54c7af68b8e2375ee9b67053b892cab5a", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-arm64.exe" - } - }, - "version": "0.16.2" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "170acf9a5754ec244904fb63494c50249ba4aea22d84c1fad9a9eeadc8c87c66", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "b4a5b264ecddeeced9c14116e1b726c6529f286bea0a14325fb6436a4b35d7ec", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "de8fe58e1ae5330597267499c2ee818ec11d5ca05ef00c29697c1cff4abcacbf", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.29.1" - }, - "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "25.0.5" - }, - "25-rc": null, - "26": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-26.1.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.4.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-26.1.4.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-26.1.4.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-26.1.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.1.4.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-26.1.4.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.16.1.linux-amd64", - "sha256": "62c2cb471c765b48a2b6fd0c09c8149b789695eb631bc1b7b60c047f75907f3f", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.16.1.linux-arm-v6", - "sha256": "e8092bdfe77337b27d963d5a0090b7be73e293e1c59ff0ceaac560b749fe42ba", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.16.1.linux-arm-v7", - "sha256": "8acad24cbefa6e8614c55fed2ac5c822303647563a4e14019eb9e8907ac02b5b", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.16.1.linux-arm64", - "sha256": "024f62e6bcd20d29f9ab45ecb49963f93311991465dddc62b8d8a32443aa36ce", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-arm64" - }, - "ppc64le": { - "file": "buildx-v0.16.1.linux-ppc64le", - "sha256": "328dc59f720f59aef58af35af3202a479bac7ccbb8c02fd9db60e8dd4561a2a1", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.16.1.linux-riscv64", - "sha256": "2f6a0703e3359395574621a071896d02ea4240570813a5ea154febbe6d39fba0", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.16.1.linux-s390x", - "sha256": "3423d552b0ed13538890b054cf5bc1605a396f77ef800a9a8192024cb5e90230", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.16.1.windows-amd64.exe", - "sha256": "34b8bd302364e9df99ebcd86658eae6ade175baf8baf6e74123ae04fcb2675c3", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.16.1.windows-arm64.exe", - "sha256": "1533b0dd26aada59b891e7c94416955ab0e3720d4930438a64df497689fc1155", - "url": "https://github.com/docker/buildx/releases/download/v0.16.1/buildx-v0.16.1.windows-arm64.exe" - } - }, - "version": "0.16.1" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "170acf9a5754ec244904fb63494c50249ba4aea22d84c1fad9a9eeadc8c87c66", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "b4a5b264ecddeeced9c14116e1b726c6529f286bea0a14325fb6436a4b35d7ec", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "de8fe58e1ae5330597267499c2ee818ec11d5ca05ef00c29697c1cff4abcacbf", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.29.1" - }, - "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "26.1.4" - }, - "26-rc": null, "27": { "arches": { "amd64": { From d1e3afec3ab45970a78125805ea8c2c9dc52652f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 13 Aug 2024 09:47:50 -0700 Subject: [PATCH 391/667] Update 27 to 27.1.2 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 06c2912b4..399cf9e43 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.1.1 +ENV DOCKER_VERSION 27.1.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.1.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index 16c59938e..795998ae9 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.1.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index d2f7a4fd2..332955bb0 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.1.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 969d277cf..3fd6ed602 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.1.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.1.zip +ENV DOCKER_VERSION 27.1.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.2.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index b0d2de2ad..431b3509d 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.1.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.1.zip +ENV DOCKER_VERSION 27.1.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.2.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/versions.json b/versions.json index fbce3c87a..658b8b265 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.1.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.1.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.1.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.1.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.1.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.1.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.1.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.1.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.1.2.zip" } }, "buildx": { @@ -137,7 +137,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.1.1" + "version": "27.1.2" }, "27-rc": null } From a19a07ac80bf856dcbcee2c6c48e594963d2780a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 16 Aug 2024 04:04:21 -0700 Subject: [PATCH 392/667] Update 27 to compose 2.29.2 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 399cf9e43..f4b317fe6 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.1 +ENV DOCKER_COMPOSE_VERSION 2.29.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64'; \ - sha256='5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9'; \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-x86_64'; \ + sha256='d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6'; \ - sha256='5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0'; \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv6'; \ + sha256='7c87109062b62da7433fceb40fabc1049060d6c594894f25ab5a4a1b8289848b'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7'; \ - sha256='0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21'; \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv7'; \ + sha256='75b2802a11277e193cb0998d0830e89b3fef28b15b66c71a7d489173db675486'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64'; \ - sha256='7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745'; \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-aarch64'; \ + sha256='1caa6c39b9df88dbd8522403d78b786a4151fa4e881c866725f75b5d99500a9d'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le'; \ - sha256='9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d'; \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-ppc64le'; \ + sha256='15dcafcfb773c56891fbba94151f86a65eb0f697ae5976fcdea71c84d58d4476'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64'; \ - sha256='91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51'; \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-riscv64'; \ + sha256='020b2500320335c3a043deda632dc811944b4e683ba1c50e1cd8917b540e01a8'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x'; \ - sha256='1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48'; \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-s390x'; \ + sha256='32930ff623836bcd87f1ff4c271daf1af93ce2246785fdd24076ef7d91505b43'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 3fd6ed602..b4e4a192f 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e +ENV DOCKER_COMPOSE_VERSION 2.29.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 431b3509d..a90bab39a 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e +ENV DOCKER_COMPOSE_VERSION 2.29.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 658b8b265..5880110e5 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "5ea89dd65d33912a83737d8a4bf070d5de534a32b8493a21fbefc924484786a9", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-x86_64" + "sha256": "d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "5fdd0653bb04798f1448bd5bdbecea02bcf39247fcc9b8aab10c05c8e680ede0", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv6" + "sha256": "7c87109062b62da7433fceb40fabc1049060d6c594894f25ab5a4a1b8289848b", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "0d675f39b3089050d0630a7151580a58abc6c189e64209c6403598b6e9fc0b21", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-armv7" + "sha256": "75b2802a11277e193cb0998d0830e89b3fef28b15b66c71a7d489173db675486", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "7f0023ba726b90347e4ebc1d94ec5970390b8bddb86402c0429f163dca70d745", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-aarch64" + "sha256": "1caa6c39b9df88dbd8522403d78b786a4151fa4e881c866725f75b5d99500a9d", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "170acf9a5754ec244904fb63494c50249ba4aea22d84c1fad9a9eeadc8c87c66", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-x86_64" + "sha256": "9aab1c7150eb4823a7073e5db0fb505f534e7fb6eb94db22623ac6d16f72625a", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "b4a5b264ecddeeced9c14116e1b726c6529f286bea0a14325fb6436a4b35d7ec", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-darwin-aarch64" + "sha256": "518c4c4aacaa3f5175356e2c47ffcd278e7dd4228c97d83d1f396a9819d4f030", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "9d69aae252fa7fd3a234647951b2af496ee927134d5456d4b8bac31d4d260f5d", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-ppc64le" + "sha256": "15dcafcfb773c56891fbba94151f86a65eb0f697ae5976fcdea71c84d58d4476", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "91b6b2f56e8cba3965a5409fa5125d3f01408c9b2d0bf5b9c119f353601d1e51", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-riscv64" + "sha256": "020b2500320335c3a043deda632dc811944b4e683ba1c50e1cd8917b540e01a8", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "1ea22d04bab9452de3169e22b60d77a232acdf829ac4858dc780085dd7fd4c48", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-linux-s390x" + "sha256": "32930ff623836bcd87f1ff4c271daf1af93ce2246785fdd24076ef7d91505b43", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "c80155bfd2669bcdc7482ae7ccf7ccaf6b5da2149b690d806c7a4d9200abc54e", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-x86_64.exe" + "sha256": "59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "de8fe58e1ae5330597267499c2ee818ec11d5ca05ef00c29697c1cff4abcacbf", - "url": "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-windows-aarch64.exe" + "sha256": "fcf7c7f9c89b2a1273a1d90b83f0111bc812442ce58e86fab34545cc5610e02e", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.1" + "version": "2.29.2" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 3fbcd5845e640f190468d9e023515e37dca8d94e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 16 Aug 2024 22:04:22 -0700 Subject: [PATCH 393/667] Update 27-rc to 27.2.0-rc.1, buildx 0.16.2, compose 2.29.2 --- 27-rc/cli/Dockerfile | 167 +++++++++++++ 27-rc/cli/docker-entrypoint.sh | 61 +++++ 27-rc/cli/modprobe.sh | 20 ++ 27-rc/dind-rootless/Dockerfile | 55 ++++ 27-rc/dind/Dockerfile | 108 ++++++++ 27-rc/dind/dockerd-entrypoint.sh | 234 ++++++++++++++++++ .../windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ versions.json | 141 ++++++++++- 9 files changed, 967 insertions(+), 1 deletion(-) create mode 100644 27-rc/cli/Dockerfile create mode 100755 27-rc/cli/docker-entrypoint.sh create mode 100755 27-rc/cli/modprobe.sh create mode 100644 27-rc/dind-rootless/Dockerfile create mode 100644 27-rc/dind/Dockerfile create mode 100755 27-rc/dind/dockerd-entrypoint.sh create mode 100644 27-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 27-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile new file mode 100644 index 000000000..e8a799d0a --- /dev/null +++ b/27-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.20 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 27.2.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.2.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-27.2.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.2.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.2.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.16.2 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64'; \ + sha256='43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6'; \ + sha256='77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7'; \ + sha256='b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64'; \ + sha256='775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le'; \ + sha256='956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64'; \ + sha256='e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x'; \ + sha256='f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.29.2 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-x86_64'; \ + sha256='d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv6'; \ + sha256='7c87109062b62da7433fceb40fabc1049060d6c594894f25ab5a4a1b8289848b'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv7'; \ + sha256='75b2802a11277e193cb0998d0830e89b3fef28b15b66c71a7d489173db675486'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-aarch64'; \ + sha256='1caa6c39b9df88dbd8522403d78b786a4151fa4e881c866725f75b5d99500a9d'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-ppc64le'; \ + sha256='15dcafcfb773c56891fbba94151f86a65eb0f697ae5976fcdea71c84d58d4476'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-riscv64'; \ + sha256='020b2500320335c3a043deda632dc811944b4e683ba1c50e1cd8917b540e01a8'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-s390x'; \ + sha256='32930ff623836bcd87f1ff4c271daf1af93ce2246785fdd24076ef7d91505b43'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/27-rc/cli/docker-entrypoint.sh b/27-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/27-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/27-rc/cli/modprobe.sh b/27-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/27-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..f975d44fb --- /dev/null +++ b/27-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.2.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.2.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile new file mode 100644 index 000000000..e8b5670bc --- /dev/null +++ b/27-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 + b="/sbin/${f/tables/tables-legacy}"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.2.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-27.2.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.2.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.2.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:27-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/27-rc/dind/dockerd-entrypoint.sh b/27-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..6c06bb811 --- /dev/null +++ b/27-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,234 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..aa67bfbfe --- /dev/null +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.2.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.2.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.16.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.29.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..6ff812c30 --- /dev/null +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.2.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.2.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.16.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.29.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 5880110e5..1479c7220 100644 --- a/versions.json +++ b/versions.json @@ -139,5 +139,144 @@ ], "version": "27.1.2" }, - "27-rc": null + "27-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.2.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.2.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.2.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.2.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.2.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.2.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.2.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.16.2.linux-amd64", + "sha256": "43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.16.2.linux-arm-v6", + "sha256": "77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.16.2.linux-arm-v7", + "sha256": "b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.16.2.linux-arm64", + "sha256": "775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.16.2.linux-ppc64le", + "sha256": "956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.16.2.linux-riscv64", + "sha256": "e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.16.2.linux-s390x", + "sha256": "f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.16.2.windows-amd64.exe", + "sha256": "0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.16.2.windows-arm64.exe", + "sha256": "2a79b06bbe0f557e271cb10182d4bcb54c7af68b8e2375ee9b67053b892cab5a", + "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-arm64.exe" + } + }, + "version": "0.16.2" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "7c87109062b62da7433fceb40fabc1049060d6c594894f25ab5a4a1b8289848b", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "75b2802a11277e193cb0998d0830e89b3fef28b15b66c71a7d489173db675486", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "1caa6c39b9df88dbd8522403d78b786a4151fa4e881c866725f75b5d99500a9d", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "9aab1c7150eb4823a7073e5db0fb505f534e7fb6eb94db22623ac6d16f72625a", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "518c4c4aacaa3f5175356e2c47ffcd278e7dd4228c97d83d1f396a9819d4f030", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "15dcafcfb773c56891fbba94151f86a65eb0f697ae5976fcdea71c84d58d4476", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "020b2500320335c3a043deda632dc811944b4e683ba1c50e1cd8917b540e01a8", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "32930ff623836bcd87f1ff4c271daf1af93ce2246785fdd24076ef7d91505b43", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "fcf7c7f9c89b2a1273a1d90b83f0111bc812442ce58e86fab34545cc5610e02e", + "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.29.2" + }, + "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "27.2.0-rc.1" + } } From 3a19522aa3c9bb06216f71f0d7323764e72c80be Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 27 Aug 2024 16:04:15 -0700 Subject: [PATCH 394/667] Update 27 to 27.2.0 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index f4b317fe6..6553268a3 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.1.2 +ENV DOCKER_VERSION 27.2.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.2.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.2.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.2.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.2.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index 795998ae9..fd5b15c06 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.2.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.2.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index 332955bb0..85031719f 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.2.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.2.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.2.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.2.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index b4e4a192f..8f354cfa8 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.1.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.2.zip +ENV DOCKER_VERSION 27.2.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.2.0.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index a90bab39a..8fa8a5a72 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.1.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.2.zip +ENV DOCKER_VERSION 27.2.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.2.0.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/versions.json b/versions.json index 1479c7220..c40e617eb 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.1.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.2.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.2.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.2.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.2.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.1.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.2.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.2.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.1.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.2.0.zip" } }, "buildx": { @@ -137,7 +137,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.1.2" + "version": "27.2.0" }, "27-rc": { "arches": { From f0c17b278827eead4809ba347f4654dd462590fa Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 27 Aug 2024 16:06:10 -0700 Subject: [PATCH 395/667] Update 27-rc --- 27-rc/cli/Dockerfile | 167 ------------- 27-rc/cli/docker-entrypoint.sh | 61 ----- 27-rc/cli/modprobe.sh | 20 -- 27-rc/dind-rootless/Dockerfile | 55 ---- 27-rc/dind/Dockerfile | 108 -------- 27-rc/dind/dockerd-entrypoint.sh | 234 ------------------ .../windows/windowsservercore-1809/Dockerfile | 91 ------- .../windowsservercore-ltsc2022/Dockerfile | 91 ------- versions.json | 141 +---------- 9 files changed, 1 insertion(+), 967 deletions(-) delete mode 100644 27-rc/cli/Dockerfile delete mode 100755 27-rc/cli/docker-entrypoint.sh delete mode 100755 27-rc/cli/modprobe.sh delete mode 100644 27-rc/dind-rootless/Dockerfile delete mode 100644 27-rc/dind/Dockerfile delete mode 100755 27-rc/dind/dockerd-entrypoint.sh delete mode 100644 27-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 27-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile deleted file mode 100644 index e8a799d0a..000000000 --- a/27-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.20 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 27.2.0-rc.1 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.2.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.2.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.2.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.2.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.16.2 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64'; \ - sha256='43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6'; \ - sha256='77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7'; \ - sha256='b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64'; \ - sha256='775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le'; \ - sha256='956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64'; \ - sha256='e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x'; \ - sha256='f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.29.2 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-x86_64'; \ - sha256='d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv6'; \ - sha256='7c87109062b62da7433fceb40fabc1049060d6c594894f25ab5a4a1b8289848b'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv7'; \ - sha256='75b2802a11277e193cb0998d0830e89b3fef28b15b66c71a7d489173db675486'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-aarch64'; \ - sha256='1caa6c39b9df88dbd8522403d78b786a4151fa4e881c866725f75b5d99500a9d'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-ppc64le'; \ - sha256='15dcafcfb773c56891fbba94151f86a65eb0f697ae5976fcdea71c84d58d4476'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-riscv64'; \ - sha256='020b2500320335c3a043deda632dc811944b4e683ba1c50e1cd8917b540e01a8'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-s390x'; \ - sha256='32930ff623836bcd87f1ff4c271daf1af93ce2246785fdd24076ef7d91505b43'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/27-rc/cli/docker-entrypoint.sh b/27-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/27-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/27-rc/cli/modprobe.sh b/27-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/27-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile deleted file mode 100644 index f975d44fb..000000000 --- a/27-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.2.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.2.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile deleted file mode 100644 index e8b5670bc..000000000 --- a/27-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 - b="/sbin/${f/tables/tables-legacy}"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.2.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.2.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.2.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.2.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:27-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/27-rc/dind/dockerd-entrypoint.sh b/27-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 6c06bb811..000000000 --- a/27-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index aa67bfbfe..000000000 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.2.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.2.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 6ff812c30..000000000 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.2.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.2.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index c40e617eb..79010320c 100644 --- a/versions.json +++ b/versions.json @@ -139,144 +139,5 @@ ], "version": "27.2.0" }, - "27-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.2.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.2.0-rc.1.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.2.0-rc.1.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.2.0-rc.1.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.2.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.2.0-rc.1.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.2.0-rc.1.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.16.2.linux-amd64", - "sha256": "43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.16.2.linux-arm-v6", - "sha256": "77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.16.2.linux-arm-v7", - "sha256": "b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.16.2.linux-arm64", - "sha256": "775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64" - }, - "ppc64le": { - "file": "buildx-v0.16.2.linux-ppc64le", - "sha256": "956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.16.2.linux-riscv64", - "sha256": "e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.16.2.linux-s390x", - "sha256": "f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.16.2.windows-amd64.exe", - "sha256": "0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.16.2.windows-arm64.exe", - "sha256": "2a79b06bbe0f557e271cb10182d4bcb54c7af68b8e2375ee9b67053b892cab5a", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-arm64.exe" - } - }, - "version": "0.16.2" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "7c87109062b62da7433fceb40fabc1049060d6c594894f25ab5a4a1b8289848b", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "75b2802a11277e193cb0998d0830e89b3fef28b15b66c71a7d489173db675486", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "1caa6c39b9df88dbd8522403d78b786a4151fa4e881c866725f75b5d99500a9d", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "9aab1c7150eb4823a7073e5db0fb505f534e7fb6eb94db22623ac6d16f72625a", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "518c4c4aacaa3f5175356e2c47ffcd278e7dd4228c97d83d1f396a9819d4f030", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "15dcafcfb773c56891fbba94151f86a65eb0f697ae5976fcdea71c84d58d4476", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "020b2500320335c3a043deda632dc811944b4e683ba1c50e1cd8917b540e01a8", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "32930ff623836bcd87f1ff4c271daf1af93ce2246785fdd24076ef7d91505b43", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "fcf7c7f9c89b2a1273a1d90b83f0111bc812442ce58e86fab34545cc5610e02e", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.29.2" - }, - "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "27.2.0-rc.1" - } + "27-rc": null } From cce8715de7ebca184feae9f3c1fa3f0d5d7c5f05 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 9 Sep 2024 04:04:22 -0700 Subject: [PATCH 396/667] Update 27 to 27.2.1 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 6553268a3..2ccae0157 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.2.0 +ENV DOCKER_VERSION 27.2.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.2.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.2.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.2.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.2.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index fd5b15c06..18070cf0f 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.2.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.2.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index 85031719f..da89cc880 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.2.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.2.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.2.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.2.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 8f354cfa8..d65e4e554 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.2.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.2.0.zip +ENV DOCKER_VERSION 27.2.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.2.1.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 8fa8a5a72..dfbfa31d1 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.2.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.2.0.zip +ENV DOCKER_VERSION 27.2.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.2.1.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/versions.json b/versions.json index 79010320c..8b634abf4 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.2.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.2.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.2.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.2.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.2.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.2.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.2.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.2.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.2.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.2.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.2.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.2.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.2.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.2.1.zip" } }, "buildx": { @@ -137,7 +137,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.2.0" + "version": "27.2.1" }, "27-rc": null } From e1b6906885f24b6985fab4aff59a91d4a793b0a0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 10 Sep 2024 16:04:14 -0700 Subject: [PATCH 397/667] Update 27 to buildx 0.17.0 --- 27/cli/Dockerfile | 30 +++++----- 27/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 2ccae0157..0926b8974 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.16.2 +ENV DOCKER_BUILDX_VERSION 0.17.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64'; \ - sha256='43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-amd64'; \ + sha256='6c65b3a80fd65312ed4949b76d10077c304ea013e78251a91cb0990562ee82a6'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6'; \ - sha256='77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm-v6'; \ + sha256='e7236f91db70ab596cfa2ecd9f05c8231d18aa8da6fffd3439d69b5b04002e81'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7'; \ - sha256='b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm-v7'; \ + sha256='e6950b2551f9930dd9894504da337a978c36052cb3517af63b4f65483364e70f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64'; \ - sha256='775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm64'; \ + sha256='8a971c4c9019f646fe9ac73c7e1cc3593a1246d43ddd9da24c588d1d93ca4c4e'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le'; \ - sha256='956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-ppc64le'; \ + sha256='73fa298b089705b0420ae7cdd6f7859b9b2d0ab157d9dbfff70cffffe6f1e8a8'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64'; \ - sha256='e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-riscv64'; \ + sha256='e7f5d0ac2d1c24d187e678f1bc40a55ef99bf04da7947d1901efa5bfeefc6869'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x'; \ - sha256='f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-s390x'; \ + sha256='1f97a8bc3bf91f0aded613adcf8115e8e9319f0d69dd912ba4712bd22dbd3f51'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index d65e4e554..163bb88cc 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c +ENV DOCKER_BUILDX_VERSION 0.17.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 2bee3541fd1ed077d5f59141085f59345d0d0380d5749724e7088a3f02a113ca RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index dfbfa31d1..b185dd324 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.16.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c +ENV DOCKER_BUILDX_VERSION 0.17.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 2bee3541fd1ed077d5f59141085f59345d0d0380d5749724e7088a3f02a113ca RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 8b634abf4..be3a480c2 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.16.2.linux-amd64", - "sha256": "43e4c928a0be38ab34e206c82957edfdd54f3e7124f1dadd7779591c3acf77ea", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-amd64" + "file": "buildx-v0.17.0.linux-amd64", + "sha256": "6c65b3a80fd65312ed4949b76d10077c304ea013e78251a91cb0990562ee82a6", + "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.16.2.linux-arm-v6", - "sha256": "77678205fbaaead25167cd93b022996d0bafff67deb5ca82b92b25cccb06ad07", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v6" + "file": "buildx-v0.17.0.linux-arm-v6", + "sha256": "e7236f91db70ab596cfa2ecd9f05c8231d18aa8da6fffd3439d69b5b04002e81", + "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.16.2.linux-arm-v7", - "sha256": "b4f029ed0d4d30c49857bc31f8bec5484b3f6b8104d8d49a187fb6b69fab3d82", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm-v7" + "file": "buildx-v0.17.0.linux-arm-v7", + "sha256": "e6950b2551f9930dd9894504da337a978c36052cb3517af63b4f65483364e70f", + "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.16.2.linux-arm64", - "sha256": "775f1ab64aa0e5d901dcc6ecf6843ec3261f27476873760711aa362b403f61f3", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-arm64" + "file": "buildx-v0.17.0.linux-arm64", + "sha256": "8a971c4c9019f646fe9ac73c7e1cc3593a1246d43ddd9da24c588d1d93ca4c4e", + "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.16.2.linux-ppc64le", - "sha256": "956b020318ad0ba94f817116792d9da8695ebab38254c9f821a85a3369175f7e", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-ppc64le" + "file": "buildx-v0.17.0.linux-ppc64le", + "sha256": "73fa298b089705b0420ae7cdd6f7859b9b2d0ab157d9dbfff70cffffe6f1e8a8", + "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.16.2.linux-riscv64", - "sha256": "e90589ff33ad409a40a5e53cde5af4a0f230f0d8f5b6d9af522120a6900222ea", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-riscv64" + "file": "buildx-v0.17.0.linux-riscv64", + "sha256": "e7f5d0ac2d1c24d187e678f1bc40a55ef99bf04da7947d1901efa5bfeefc6869", + "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.16.2.linux-s390x", - "sha256": "f2dbf2dc967415e1e1f4398d040d6b5b81e4e27f37df22bd148ea4b18c8ea6eb", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.linux-s390x" + "file": "buildx-v0.17.0.linux-s390x", + "sha256": "1f97a8bc3bf91f0aded613adcf8115e8e9319f0d69dd912ba4712bd22dbd3f51", + "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.16.2.windows-amd64.exe", - "sha256": "0ee1234dc4bec883f9407211ae386052c45d13cf9052329f8aece8358cff5e9c", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-amd64.exe" + "file": "buildx-v0.17.0.windows-amd64.exe", + "sha256": "2bee3541fd1ed077d5f59141085f59345d0d0380d5749724e7088a3f02a113ca", + "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.16.2.windows-arm64.exe", - "sha256": "2a79b06bbe0f557e271cb10182d4bcb54c7af68b8e2375ee9b67053b892cab5a", - "url": "https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.windows-arm64.exe" + "file": "buildx-v0.17.0.windows-arm64.exe", + "sha256": "54724d64ae306e827fc4e64e0c91d1601ec8d0737577ce0ce76b04747366c5bd", + "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.windows-arm64.exe" } }, - "version": "0.16.2" + "version": "0.17.0" }, "compose": { "arches": { From 13bed0173be3854bec8687e556323d3874a45882 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 12 Sep 2024 10:04:15 -0700 Subject: [PATCH 398/667] Update 27 to compose 2.29.3 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 0926b8974..59d35c083 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.2 +ENV DOCKER_COMPOSE_VERSION 2.29.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-x86_64'; \ - sha256='d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4'; \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-x86_64'; \ + sha256='241b75fe0f8194a48d01f99d683aa1100579b21caa60d2d78c9c824855c57937'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv6'; \ - sha256='7c87109062b62da7433fceb40fabc1049060d6c594894f25ab5a4a1b8289848b'; \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv6'; \ + sha256='4abff57472ce971e84ccd6d09287da02515e99e1a2208e867c5d03123a1c406d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv7'; \ - sha256='75b2802a11277e193cb0998d0830e89b3fef28b15b66c71a7d489173db675486'; \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv7'; \ + sha256='37fabd59e170943e12b4945a1a85c853e7db4759091f16036787fa02f6e2ec0a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-aarch64'; \ - sha256='1caa6c39b9df88dbd8522403d78b786a4151fa4e881c866725f75b5d99500a9d'; \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-aarch64'; \ + sha256='10ded2b3b02b15957b1650b99d1e5ff216d882c5203a563d0aa7a87580a0d8ca'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-ppc64le'; \ - sha256='15dcafcfb773c56891fbba94151f86a65eb0f697ae5976fcdea71c84d58d4476'; \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-ppc64le'; \ + sha256='f8c63bcc8e8dca6703893c6fe909a10aef288bc347ee37922afc0099abf87946'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-riscv64'; \ - sha256='020b2500320335c3a043deda632dc811944b4e683ba1c50e1cd8917b540e01a8'; \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-riscv64'; \ + sha256='9e51a8531b0db7f96b1ef8c9c27f104b4847c867af72056d3f7625b065cf9861'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-s390x'; \ - sha256='32930ff623836bcd87f1ff4c271daf1af93ce2246785fdd24076ef7d91505b43'; \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-s390x'; \ + sha256='3929a9d8a6a7a2521de7c2b148337f04dd360e30a2114a8200b123b398e97c35'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 163bb88cc..fcd5ed345 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25 +ENV DOCKER_COMPOSE_VERSION 2.29.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index b185dd324..2aec76427 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25 +ENV DOCKER_COMPOSE_VERSION 2.29.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index be3a480c2..28a4ee886 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "d037bd4937bf18fba67cff4366e084ee125a3e15c25657ee1aeceff8db3672b4", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-x86_64" + "sha256": "241b75fe0f8194a48d01f99d683aa1100579b21caa60d2d78c9c824855c57937", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "7c87109062b62da7433fceb40fabc1049060d6c594894f25ab5a4a1b8289848b", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv6" + "sha256": "4abff57472ce971e84ccd6d09287da02515e99e1a2208e867c5d03123a1c406d", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "75b2802a11277e193cb0998d0830e89b3fef28b15b66c71a7d489173db675486", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-armv7" + "sha256": "37fabd59e170943e12b4945a1a85c853e7db4759091f16036787fa02f6e2ec0a", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "1caa6c39b9df88dbd8522403d78b786a4151fa4e881c866725f75b5d99500a9d", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-aarch64" + "sha256": "10ded2b3b02b15957b1650b99d1e5ff216d882c5203a563d0aa7a87580a0d8ca", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9aab1c7150eb4823a7073e5db0fb505f534e7fb6eb94db22623ac6d16f72625a", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-darwin-x86_64" + "sha256": "5f5d7d527755fafca3e3f1952b966bc88206c4e16d3a3307bdedce3ffa245dfc", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "518c4c4aacaa3f5175356e2c47ffcd278e7dd4228c97d83d1f396a9819d4f030", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-darwin-aarch64" + "sha256": "cf032a3c1cdff87a4f3dd0136ae334a8f88e6f0f277ebf996bce796342c83c45", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "15dcafcfb773c56891fbba94151f86a65eb0f697ae5976fcdea71c84d58d4476", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-ppc64le" + "sha256": "f8c63bcc8e8dca6703893c6fe909a10aef288bc347ee37922afc0099abf87946", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "020b2500320335c3a043deda632dc811944b4e683ba1c50e1cd8917b540e01a8", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-riscv64" + "sha256": "9e51a8531b0db7f96b1ef8c9c27f104b4847c867af72056d3f7625b065cf9861", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "32930ff623836bcd87f1ff4c271daf1af93ce2246785fdd24076ef7d91505b43", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-s390x" + "sha256": "3929a9d8a6a7a2521de7c2b148337f04dd360e30a2114a8200b123b398e97c35", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "59cd2bd789ab2e5920674b8ac5d17a19a684b1622f17c847cc7361e832508d25", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-x86_64.exe" + "sha256": "8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "fcf7c7f9c89b2a1273a1d90b83f0111bc812442ce58e86fab34545cc5610e02e", - "url": "https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-windows-aarch64.exe" + "sha256": "411e4d6365833e394aa8f72b6f35c2b335f15695bdf3b6bec191efa778fcd80f", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.2" + "version": "2.29.3" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 14558402153b8a33a5a8d91c0ccbbb40cc0b313f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 13 Sep 2024 09:57:42 -0700 Subject: [PATCH 399/667] Update 27 to buildx 0.17.1 --- 27/cli/Dockerfile | 30 +++++----- 27/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 59d35c083..43110de37 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.17.0 +ENV DOCKER_BUILDX_VERSION 0.17.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-amd64'; \ - sha256='6c65b3a80fd65312ed4949b76d10077c304ea013e78251a91cb0990562ee82a6'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-amd64'; \ + sha256='aa7a9778349e1a8ace685e4c51a1d33e7a9b0aa6925d1c625b09cb3800eba696'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm-v6'; \ - sha256='e7236f91db70ab596cfa2ecd9f05c8231d18aa8da6fffd3439d69b5b04002e81'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v6'; \ + sha256='8c287b02430036d42323052e228ee8e26a6e7f7c5858b170f6f82be812d8043b'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm-v7'; \ - sha256='e6950b2551f9930dd9894504da337a978c36052cb3517af63b4f65483364e70f'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v7'; \ + sha256='5454c2feddb76000c22cb8abafe8f4a03e6fee12aae9031f9e02b661e76012c8'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm64'; \ - sha256='8a971c4c9019f646fe9ac73c7e1cc3593a1246d43ddd9da24c588d1d93ca4c4e'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm64'; \ + sha256='de05dccd47932eb9fd6e63781ab29d2b0b2c834bbdd19b51d7ea452b1fe378d3'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-ppc64le'; \ - sha256='73fa298b089705b0420ae7cdd6f7859b9b2d0ab157d9dbfff70cffffe6f1e8a8'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-ppc64le'; \ + sha256='29b4f2de5a1e6ecb4096868111d693a8ba4aaf144d535242ce19fc4154f94a4e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-riscv64'; \ - sha256='e7f5d0ac2d1c24d187e678f1bc40a55ef99bf04da7947d1901efa5bfeefc6869'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-riscv64'; \ + sha256='e67d26acb10c4529b9b5ca4e20781865d63e538228c566af6d1e91da65cdb992'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-s390x'; \ - sha256='1f97a8bc3bf91f0aded613adcf8115e8e9319f0d69dd912ba4712bd22dbd3f51'; \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-s390x'; \ + sha256='9a3a4376025d1c2771ac69aceff0bcb19a2594413e318a34455af037ce903f06'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index fcd5ed345..6670d0849 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.17.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 2bee3541fd1ed077d5f59141085f59345d0d0380d5749724e7088a3f02a113ca +ENV DOCKER_BUILDX_VERSION 0.17.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 2aec76427..f86f3e44f 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.17.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 2bee3541fd1ed077d5f59141085f59345d0d0380d5749724e7088a3f02a113ca +ENV DOCKER_BUILDX_VERSION 0.17.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 28a4ee886..7dd82b5bc 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.17.0.linux-amd64", - "sha256": "6c65b3a80fd65312ed4949b76d10077c304ea013e78251a91cb0990562ee82a6", - "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-amd64" + "file": "buildx-v0.17.1.linux-amd64", + "sha256": "aa7a9778349e1a8ace685e4c51a1d33e7a9b0aa6925d1c625b09cb3800eba696", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.17.0.linux-arm-v6", - "sha256": "e7236f91db70ab596cfa2ecd9f05c8231d18aa8da6fffd3439d69b5b04002e81", - "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm-v6" + "file": "buildx-v0.17.1.linux-arm-v6", + "sha256": "8c287b02430036d42323052e228ee8e26a6e7f7c5858b170f6f82be812d8043b", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.17.0.linux-arm-v7", - "sha256": "e6950b2551f9930dd9894504da337a978c36052cb3517af63b4f65483364e70f", - "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm-v7" + "file": "buildx-v0.17.1.linux-arm-v7", + "sha256": "5454c2feddb76000c22cb8abafe8f4a03e6fee12aae9031f9e02b661e76012c8", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.17.0.linux-arm64", - "sha256": "8a971c4c9019f646fe9ac73c7e1cc3593a1246d43ddd9da24c588d1d93ca4c4e", - "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-arm64" + "file": "buildx-v0.17.1.linux-arm64", + "sha256": "de05dccd47932eb9fd6e63781ab29d2b0b2c834bbdd19b51d7ea452b1fe378d3", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.17.0.linux-ppc64le", - "sha256": "73fa298b089705b0420ae7cdd6f7859b9b2d0ab157d9dbfff70cffffe6f1e8a8", - "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-ppc64le" + "file": "buildx-v0.17.1.linux-ppc64le", + "sha256": "29b4f2de5a1e6ecb4096868111d693a8ba4aaf144d535242ce19fc4154f94a4e", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.17.0.linux-riscv64", - "sha256": "e7f5d0ac2d1c24d187e678f1bc40a55ef99bf04da7947d1901efa5bfeefc6869", - "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-riscv64" + "file": "buildx-v0.17.1.linux-riscv64", + "sha256": "e67d26acb10c4529b9b5ca4e20781865d63e538228c566af6d1e91da65cdb992", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.17.0.linux-s390x", - "sha256": "1f97a8bc3bf91f0aded613adcf8115e8e9319f0d69dd912ba4712bd22dbd3f51", - "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.linux-s390x" + "file": "buildx-v0.17.1.linux-s390x", + "sha256": "9a3a4376025d1c2771ac69aceff0bcb19a2594413e318a34455af037ce903f06", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.17.0.windows-amd64.exe", - "sha256": "2bee3541fd1ed077d5f59141085f59345d0d0380d5749724e7088a3f02a113ca", - "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.windows-amd64.exe" + "file": "buildx-v0.17.1.windows-amd64.exe", + "sha256": "8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.17.0.windows-arm64.exe", - "sha256": "54724d64ae306e827fc4e64e0c91d1601ec8d0737577ce0ce76b04747366c5bd", - "url": "https://github.com/docker/buildx/releases/download/v0.17.0/buildx-v0.17.0.windows-arm64.exe" + "file": "buildx-v0.17.1.windows-arm64.exe", + "sha256": "e9c302fb36d16ba8df5488f536a66966f807c4342efc59f5b669d31cd0370d67", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-arm64.exe" } }, - "version": "0.17.0" + "version": "0.17.1" }, "compose": { "arches": { From 8debc3edb949c6d48307282188d534d95f9ad305 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 13 Sep 2024 09:59:50 -0700 Subject: [PATCH 400/667] Update 27-rc to 27.3.0-rc.1, buildx 0.17.1, compose 2.29.3 --- 27-rc/cli/Dockerfile | 167 +++++++++++++ 27-rc/cli/docker-entrypoint.sh | 61 +++++ 27-rc/cli/modprobe.sh | 20 ++ 27-rc/dind-rootless/Dockerfile | 55 ++++ 27-rc/dind/Dockerfile | 108 ++++++++ 27-rc/dind/dockerd-entrypoint.sh | 234 ++++++++++++++++++ .../windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ versions.json | 141 ++++++++++- 9 files changed, 967 insertions(+), 1 deletion(-) create mode 100644 27-rc/cli/Dockerfile create mode 100755 27-rc/cli/docker-entrypoint.sh create mode 100755 27-rc/cli/modprobe.sh create mode 100644 27-rc/dind-rootless/Dockerfile create mode 100644 27-rc/dind/Dockerfile create mode 100755 27-rc/dind/dockerd-entrypoint.sh create mode 100644 27-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 27-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile new file mode 100644 index 000000000..517f795be --- /dev/null +++ b/27-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.20 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 27.3.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.17.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-amd64'; \ + sha256='aa7a9778349e1a8ace685e4c51a1d33e7a9b0aa6925d1c625b09cb3800eba696'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v6'; \ + sha256='8c287b02430036d42323052e228ee8e26a6e7f7c5858b170f6f82be812d8043b'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v7'; \ + sha256='5454c2feddb76000c22cb8abafe8f4a03e6fee12aae9031f9e02b661e76012c8'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm64'; \ + sha256='de05dccd47932eb9fd6e63781ab29d2b0b2c834bbdd19b51d7ea452b1fe378d3'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-ppc64le'; \ + sha256='29b4f2de5a1e6ecb4096868111d693a8ba4aaf144d535242ce19fc4154f94a4e'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-riscv64'; \ + sha256='e67d26acb10c4529b9b5ca4e20781865d63e538228c566af6d1e91da65cdb992'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-s390x'; \ + sha256='9a3a4376025d1c2771ac69aceff0bcb19a2594413e318a34455af037ce903f06'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.29.3 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-x86_64'; \ + sha256='241b75fe0f8194a48d01f99d683aa1100579b21caa60d2d78c9c824855c57937'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv6'; \ + sha256='4abff57472ce971e84ccd6d09287da02515e99e1a2208e867c5d03123a1c406d'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv7'; \ + sha256='37fabd59e170943e12b4945a1a85c853e7db4759091f16036787fa02f6e2ec0a'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-aarch64'; \ + sha256='10ded2b3b02b15957b1650b99d1e5ff216d882c5203a563d0aa7a87580a0d8ca'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-ppc64le'; \ + sha256='f8c63bcc8e8dca6703893c6fe909a10aef288bc347ee37922afc0099abf87946'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-riscv64'; \ + sha256='9e51a8531b0db7f96b1ef8c9c27f104b4847c867af72056d3f7625b065cf9861'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-s390x'; \ + sha256='3929a9d8a6a7a2521de7c2b148337f04dd360e30a2114a8200b123b398e97c35'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/27-rc/cli/docker-entrypoint.sh b/27-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/27-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/27-rc/cli/modprobe.sh b/27-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/27-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..818a0054f --- /dev/null +++ b/27-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.3.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.3.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile new file mode 100644 index 000000000..064571f84 --- /dev/null +++ b/27-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 + b="/sbin/${f/tables/tables-legacy}"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:27-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/27-rc/dind/dockerd-entrypoint.sh b/27-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..6c06bb811 --- /dev/null +++ b/27-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,234 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..f7054fdc9 --- /dev/null +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.3.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.17.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.29.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..a6c73d921 --- /dev/null +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.3.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.17.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.29.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 7dd82b5bc..bc4d23ba5 100644 --- a/versions.json +++ b/versions.json @@ -139,5 +139,144 @@ ], "version": "27.2.1" }, - "27-rc": null + "27-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.3.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.3.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.17.1.linux-amd64", + "sha256": "aa7a9778349e1a8ace685e4c51a1d33e7a9b0aa6925d1c625b09cb3800eba696", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.17.1.linux-arm-v6", + "sha256": "8c287b02430036d42323052e228ee8e26a6e7f7c5858b170f6f82be812d8043b", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.17.1.linux-arm-v7", + "sha256": "5454c2feddb76000c22cb8abafe8f4a03e6fee12aae9031f9e02b661e76012c8", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.17.1.linux-arm64", + "sha256": "de05dccd47932eb9fd6e63781ab29d2b0b2c834bbdd19b51d7ea452b1fe378d3", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.17.1.linux-ppc64le", + "sha256": "29b4f2de5a1e6ecb4096868111d693a8ba4aaf144d535242ce19fc4154f94a4e", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.17.1.linux-riscv64", + "sha256": "e67d26acb10c4529b9b5ca4e20781865d63e538228c566af6d1e91da65cdb992", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.17.1.linux-s390x", + "sha256": "9a3a4376025d1c2771ac69aceff0bcb19a2594413e318a34455af037ce903f06", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.17.1.windows-amd64.exe", + "sha256": "8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.17.1.windows-arm64.exe", + "sha256": "e9c302fb36d16ba8df5488f536a66966f807c4342efc59f5b669d31cd0370d67", + "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-arm64.exe" + } + }, + "version": "0.17.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "241b75fe0f8194a48d01f99d683aa1100579b21caa60d2d78c9c824855c57937", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "4abff57472ce971e84ccd6d09287da02515e99e1a2208e867c5d03123a1c406d", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "37fabd59e170943e12b4945a1a85c853e7db4759091f16036787fa02f6e2ec0a", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "10ded2b3b02b15957b1650b99d1e5ff216d882c5203a563d0aa7a87580a0d8ca", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "5f5d7d527755fafca3e3f1952b966bc88206c4e16d3a3307bdedce3ffa245dfc", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "cf032a3c1cdff87a4f3dd0136ae334a8f88e6f0f277ebf996bce796342c83c45", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "f8c63bcc8e8dca6703893c6fe909a10aef288bc347ee37922afc0099abf87946", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "9e51a8531b0db7f96b1ef8c9c27f104b4847c867af72056d3f7625b065cf9861", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "3929a9d8a6a7a2521de7c2b148337f04dd360e30a2114a8200b123b398e97c35", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "411e4d6365833e394aa8f72b6f35c2b335f15695bdf3b6bec191efa778fcd80f", + "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.29.3" + }, + "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "27.3.0-rc.1" + } } From 12866bea2a3c9b95cb39f79e62537123a2ab96bb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 16 Sep 2024 04:04:14 -0700 Subject: [PATCH 401/667] Update 27 to compose 2.29.4 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 43110de37..91a617a71 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.3 +ENV DOCKER_COMPOSE_VERSION 2.29.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-x86_64'; \ - sha256='241b75fe0f8194a48d01f99d683aa1100579b21caa60d2d78c9c824855c57937'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-x86_64'; \ + sha256='2eb8de746c0bc724bb5da4de52fc9660c2e866afc9a639ffdb1adfef2649cc0c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv6'; \ - sha256='4abff57472ce971e84ccd6d09287da02515e99e1a2208e867c5d03123a1c406d'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv6'; \ + sha256='ad707af427c3d3574c9e7dbc77915dcd06779a58e2c3b3783f7781166213454e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv7'; \ - sha256='37fabd59e170943e12b4945a1a85c853e7db4759091f16036787fa02f6e2ec0a'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv7'; \ + sha256='bd473fb4fcdb6ff9d1616d7ff3294387a574298083de91a36eed2741341f3c97'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-aarch64'; \ - sha256='10ded2b3b02b15957b1650b99d1e5ff216d882c5203a563d0aa7a87580a0d8ca'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-aarch64'; \ + sha256='d95d239bec166137a1ede1d441cb808da800dacc6041c966be35066aa96c6ee7'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-ppc64le'; \ - sha256='f8c63bcc8e8dca6703893c6fe909a10aef288bc347ee37922afc0099abf87946'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-ppc64le'; \ + sha256='72d4359904b6821b04b77f7dac609b994847838d1d38e5840362d64dc35d9bff'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-riscv64'; \ - sha256='9e51a8531b0db7f96b1ef8c9c27f104b4847c867af72056d3f7625b065cf9861'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-riscv64'; \ + sha256='34f859fd5b5d3f081a88004ad9a165b01f5b549abb76e0b99a3281bc963ebbde'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-s390x'; \ - sha256='3929a9d8a6a7a2521de7c2b148337f04dd360e30a2114a8200b123b398e97c35'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-s390x'; \ + sha256='d4f333a3abb6f4904e75e56196a3e6671797ef2f5e09cfbe71263f2dad466ea0'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 6670d0849..fa81b064f 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f +ENV DOCKER_COMPOSE_VERSION 2.29.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index f86f3e44f..9fe8008a4 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f +ENV DOCKER_COMPOSE_VERSION 2.29.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index bc4d23ba5..b555931b8 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "241b75fe0f8194a48d01f99d683aa1100579b21caa60d2d78c9c824855c57937", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-x86_64" + "sha256": "2eb8de746c0bc724bb5da4de52fc9660c2e866afc9a639ffdb1adfef2649cc0c", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4abff57472ce971e84ccd6d09287da02515e99e1a2208e867c5d03123a1c406d", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv6" + "sha256": "ad707af427c3d3574c9e7dbc77915dcd06779a58e2c3b3783f7781166213454e", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "37fabd59e170943e12b4945a1a85c853e7db4759091f16036787fa02f6e2ec0a", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv7" + "sha256": "bd473fb4fcdb6ff9d1616d7ff3294387a574298083de91a36eed2741341f3c97", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "10ded2b3b02b15957b1650b99d1e5ff216d882c5203a563d0aa7a87580a0d8ca", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-aarch64" + "sha256": "d95d239bec166137a1ede1d441cb808da800dacc6041c966be35066aa96c6ee7", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "5f5d7d527755fafca3e3f1952b966bc88206c4e16d3a3307bdedce3ffa245dfc", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-darwin-x86_64" + "sha256": "47d3b98679594041ecd5b972894b1ff6710b845224fef194af9922100c5b9275", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "cf032a3c1cdff87a4f3dd0136ae334a8f88e6f0f277ebf996bce796342c83c45", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-darwin-aarch64" + "sha256": "e2a2870e485431792ad9254950994e1c7637e97c90ad2191f209d3cc87e89de5", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "f8c63bcc8e8dca6703893c6fe909a10aef288bc347ee37922afc0099abf87946", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-ppc64le" + "sha256": "72d4359904b6821b04b77f7dac609b994847838d1d38e5840362d64dc35d9bff", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9e51a8531b0db7f96b1ef8c9c27f104b4847c867af72056d3f7625b065cf9861", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-riscv64" + "sha256": "34f859fd5b5d3f081a88004ad9a165b01f5b549abb76e0b99a3281bc963ebbde", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "3929a9d8a6a7a2521de7c2b148337f04dd360e30a2114a8200b123b398e97c35", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-s390x" + "sha256": "d4f333a3abb6f4904e75e56196a3e6671797ef2f5e09cfbe71263f2dad466ea0", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe" + "sha256": "ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "411e4d6365833e394aa8f72b6f35c2b335f15695bdf3b6bec191efa778fcd80f", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-aarch64.exe" + "sha256": "48f758eaa0d08d5bb463dca435c6b5fe8c301102c31ce2ad53c4438241209a05", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.3" + "version": "2.29.4" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 99ff91579f4ce09b5ae78bdbc1de20c4c11ca7a7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 16 Sep 2024 04:06:08 -0700 Subject: [PATCH 402/667] Update 27-rc to compose 2.29.4 --- 27-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index 517f795be..5f5fd7f21 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.3 +ENV DOCKER_COMPOSE_VERSION 2.29.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-x86_64'; \ - sha256='241b75fe0f8194a48d01f99d683aa1100579b21caa60d2d78c9c824855c57937'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-x86_64'; \ + sha256='2eb8de746c0bc724bb5da4de52fc9660c2e866afc9a639ffdb1adfef2649cc0c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv6'; \ - sha256='4abff57472ce971e84ccd6d09287da02515e99e1a2208e867c5d03123a1c406d'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv6'; \ + sha256='ad707af427c3d3574c9e7dbc77915dcd06779a58e2c3b3783f7781166213454e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv7'; \ - sha256='37fabd59e170943e12b4945a1a85c853e7db4759091f16036787fa02f6e2ec0a'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv7'; \ + sha256='bd473fb4fcdb6ff9d1616d7ff3294387a574298083de91a36eed2741341f3c97'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-aarch64'; \ - sha256='10ded2b3b02b15957b1650b99d1e5ff216d882c5203a563d0aa7a87580a0d8ca'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-aarch64'; \ + sha256='d95d239bec166137a1ede1d441cb808da800dacc6041c966be35066aa96c6ee7'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-ppc64le'; \ - sha256='f8c63bcc8e8dca6703893c6fe909a10aef288bc347ee37922afc0099abf87946'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-ppc64le'; \ + sha256='72d4359904b6821b04b77f7dac609b994847838d1d38e5840362d64dc35d9bff'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-riscv64'; \ - sha256='9e51a8531b0db7f96b1ef8c9c27f104b4847c867af72056d3f7625b065cf9861'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-riscv64'; \ + sha256='34f859fd5b5d3f081a88004ad9a165b01f5b549abb76e0b99a3281bc963ebbde'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-s390x'; \ - sha256='3929a9d8a6a7a2521de7c2b148337f04dd360e30a2114a8200b123b398e97c35'; \ + url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-s390x'; \ + sha256='d4f333a3abb6f4904e75e56196a3e6671797ef2f5e09cfbe71263f2dad466ea0'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index f7054fdc9..bf1ba9683 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f +ENV DOCKER_COMPOSE_VERSION 2.29.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index a6c73d921..ef267128e 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f +ENV DOCKER_COMPOSE_VERSION 2.29.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b555931b8..133bf4a23 100644 --- a/versions.json +++ b/versions.json @@ -213,61 +213,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "241b75fe0f8194a48d01f99d683aa1100579b21caa60d2d78c9c824855c57937", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-x86_64" + "sha256": "2eb8de746c0bc724bb5da4de52fc9660c2e866afc9a639ffdb1adfef2649cc0c", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4abff57472ce971e84ccd6d09287da02515e99e1a2208e867c5d03123a1c406d", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv6" + "sha256": "ad707af427c3d3574c9e7dbc77915dcd06779a58e2c3b3783f7781166213454e", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "37fabd59e170943e12b4945a1a85c853e7db4759091f16036787fa02f6e2ec0a", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-armv7" + "sha256": "bd473fb4fcdb6ff9d1616d7ff3294387a574298083de91a36eed2741341f3c97", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "10ded2b3b02b15957b1650b99d1e5ff216d882c5203a563d0aa7a87580a0d8ca", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-aarch64" + "sha256": "d95d239bec166137a1ede1d441cb808da800dacc6041c966be35066aa96c6ee7", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "5f5d7d527755fafca3e3f1952b966bc88206c4e16d3a3307bdedce3ffa245dfc", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-darwin-x86_64" + "sha256": "47d3b98679594041ecd5b972894b1ff6710b845224fef194af9922100c5b9275", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "cf032a3c1cdff87a4f3dd0136ae334a8f88e6f0f277ebf996bce796342c83c45", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-darwin-aarch64" + "sha256": "e2a2870e485431792ad9254950994e1c7637e97c90ad2191f209d3cc87e89de5", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "f8c63bcc8e8dca6703893c6fe909a10aef288bc347ee37922afc0099abf87946", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-ppc64le" + "sha256": "72d4359904b6821b04b77f7dac609b994847838d1d38e5840362d64dc35d9bff", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9e51a8531b0db7f96b1ef8c9c27f104b4847c867af72056d3f7625b065cf9861", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-riscv64" + "sha256": "34f859fd5b5d3f081a88004ad9a165b01f5b549abb76e0b99a3281bc963ebbde", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "3929a9d8a6a7a2521de7c2b148337f04dd360e30a2114a8200b123b398e97c35", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-linux-s390x" + "sha256": "d4f333a3abb6f4904e75e56196a3e6671797ef2f5e09cfbe71263f2dad466ea0", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "8603f4e6936e752793f7edf3f45ed67cb1b8ed8c7b1dabc5721384299bfebd7f", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-x86_64.exe" + "sha256": "ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "411e4d6365833e394aa8f72b6f35c2b335f15695bdf3b6bec191efa778fcd80f", - "url": "https://github.com/docker/compose/releases/download/v2.29.3/docker-compose-windows-aarch64.exe" + "sha256": "48f758eaa0d08d5bb463dca435c6b5fe8c301102c31ce2ad53c4438241209a05", + "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.3" + "version": "2.29.4" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From c5f51099b9d89dfd55d60d40b1ecba94da8ad364 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Sep 2024 04:04:23 -0700 Subject: [PATCH 403/667] Update 27 to compose 2.29.5 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 91a617a71..24d3cd266 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.4 +ENV DOCKER_COMPOSE_VERSION 2.29.5 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-x86_64'; \ - sha256='2eb8de746c0bc724bb5da4de52fc9660c2e866afc9a639ffdb1adfef2649cc0c'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-x86_64'; \ + sha256='589f98f1395936170815282d77dbcb9935210536c769778aedd09c4ff5eec33b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv6'; \ - sha256='ad707af427c3d3574c9e7dbc77915dcd06779a58e2c3b3783f7781166213454e'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv6'; \ + sha256='3484cca874ef8eac4a81a020acbf8380dd9fa6176a1162a2591a42dd26d3d182'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv7'; \ - sha256='bd473fb4fcdb6ff9d1616d7ff3294387a574298083de91a36eed2741341f3c97'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv7'; \ + sha256='03848bfe15f37fb078d6ad6f63183de985c837791e472b4e15e5768ab29ca84b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-aarch64'; \ - sha256='d95d239bec166137a1ede1d441cb808da800dacc6041c966be35066aa96c6ee7'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-aarch64'; \ + sha256='1301f1e1d94e9f03f39448c1bff5b14238770438f5c698e09ffaa7fad9969901'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-ppc64le'; \ - sha256='72d4359904b6821b04b77f7dac609b994847838d1d38e5840362d64dc35d9bff'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-ppc64le'; \ + sha256='756103706b378948e989d8aa7e4694a9d8691aabd73019064b57ad4315f6388a'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-riscv64'; \ - sha256='34f859fd5b5d3f081a88004ad9a165b01f5b549abb76e0b99a3281bc963ebbde'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-riscv64'; \ + sha256='6dca0ca98fdcbfbbf26318bf74bb7faf8f221201370f059c83dc554fe08fce23'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-s390x'; \ - sha256='d4f333a3abb6f4904e75e56196a3e6671797ef2f5e09cfbe71263f2dad466ea0'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-s390x'; \ + sha256='6a43ae85495ceaa1b41f8958c1677ce0e25991f96b3bc47107f4af0e4db8927d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index fa81b064f..d9577e37d 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8 +ENV DOCKER_COMPOSE_VERSION 2.29.5 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 9fe8008a4..e8165021c 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8 +ENV DOCKER_COMPOSE_VERSION 2.29.5 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 133bf4a23..78751cf6a 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "2eb8de746c0bc724bb5da4de52fc9660c2e866afc9a639ffdb1adfef2649cc0c", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-x86_64" + "sha256": "589f98f1395936170815282d77dbcb9935210536c769778aedd09c4ff5eec33b", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "ad707af427c3d3574c9e7dbc77915dcd06779a58e2c3b3783f7781166213454e", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv6" + "sha256": "3484cca874ef8eac4a81a020acbf8380dd9fa6176a1162a2591a42dd26d3d182", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "bd473fb4fcdb6ff9d1616d7ff3294387a574298083de91a36eed2741341f3c97", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv7" + "sha256": "03848bfe15f37fb078d6ad6f63183de985c837791e472b4e15e5768ab29ca84b", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d95d239bec166137a1ede1d441cb808da800dacc6041c966be35066aa96c6ee7", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-aarch64" + "sha256": "1301f1e1d94e9f03f39448c1bff5b14238770438f5c698e09ffaa7fad9969901", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "47d3b98679594041ecd5b972894b1ff6710b845224fef194af9922100c5b9275", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-darwin-x86_64" + "sha256": "00f7862dad89bb8acef7e8e57f1483a056728496353b4d881eecb36aa9888dbd", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "e2a2870e485431792ad9254950994e1c7637e97c90ad2191f209d3cc87e89de5", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-darwin-aarch64" + "sha256": "a50e36a960aec5bba34049b2e898f488410f1c38a15a84a8ae28d1c9aacae3df", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "72d4359904b6821b04b77f7dac609b994847838d1d38e5840362d64dc35d9bff", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-ppc64le" + "sha256": "756103706b378948e989d8aa7e4694a9d8691aabd73019064b57ad4315f6388a", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "34f859fd5b5d3f081a88004ad9a165b01f5b549abb76e0b99a3281bc963ebbde", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-riscv64" + "sha256": "6dca0ca98fdcbfbbf26318bf74bb7faf8f221201370f059c83dc554fe08fce23", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "d4f333a3abb6f4904e75e56196a3e6671797ef2f5e09cfbe71263f2dad466ea0", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-s390x" + "sha256": "6a43ae85495ceaa1b41f8958c1677ce0e25991f96b3bc47107f4af0e4db8927d", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe" + "sha256": "4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "48f758eaa0d08d5bb463dca435c6b5fe8c301102c31ce2ad53c4438241209a05", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-aarch64.exe" + "sha256": "3ad4b62cab1a54e61ee05946943fd8331897a4ead8dc1ff45f131cdf1a2d3463", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.4" + "version": "2.29.5" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 99372b0dca1bacabe5af124932b9017526068dad Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Sep 2024 04:05:55 -0700 Subject: [PATCH 404/667] Update 27-rc to compose 2.29.5 --- 27-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index 5f5fd7f21..4d48abbd5 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.4 +ENV DOCKER_COMPOSE_VERSION 2.29.5 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-x86_64'; \ - sha256='2eb8de746c0bc724bb5da4de52fc9660c2e866afc9a639ffdb1adfef2649cc0c'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-x86_64'; \ + sha256='589f98f1395936170815282d77dbcb9935210536c769778aedd09c4ff5eec33b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv6'; \ - sha256='ad707af427c3d3574c9e7dbc77915dcd06779a58e2c3b3783f7781166213454e'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv6'; \ + sha256='3484cca874ef8eac4a81a020acbf8380dd9fa6176a1162a2591a42dd26d3d182'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv7'; \ - sha256='bd473fb4fcdb6ff9d1616d7ff3294387a574298083de91a36eed2741341f3c97'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv7'; \ + sha256='03848bfe15f37fb078d6ad6f63183de985c837791e472b4e15e5768ab29ca84b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-aarch64'; \ - sha256='d95d239bec166137a1ede1d441cb808da800dacc6041c966be35066aa96c6ee7'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-aarch64'; \ + sha256='1301f1e1d94e9f03f39448c1bff5b14238770438f5c698e09ffaa7fad9969901'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-ppc64le'; \ - sha256='72d4359904b6821b04b77f7dac609b994847838d1d38e5840362d64dc35d9bff'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-ppc64le'; \ + sha256='756103706b378948e989d8aa7e4694a9d8691aabd73019064b57ad4315f6388a'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-riscv64'; \ - sha256='34f859fd5b5d3f081a88004ad9a165b01f5b549abb76e0b99a3281bc963ebbde'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-riscv64'; \ + sha256='6dca0ca98fdcbfbbf26318bf74bb7faf8f221201370f059c83dc554fe08fce23'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-s390x'; \ - sha256='d4f333a3abb6f4904e75e56196a3e6671797ef2f5e09cfbe71263f2dad466ea0'; \ + url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-s390x'; \ + sha256='6a43ae85495ceaa1b41f8958c1677ce0e25991f96b3bc47107f4af0e4db8927d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index bf1ba9683..4f638d6c5 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8 +ENV DOCKER_COMPOSE_VERSION 2.29.5 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index ef267128e..ab04ef936 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8 +ENV DOCKER_COMPOSE_VERSION 2.29.5 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 78751cf6a..52aba42c4 100644 --- a/versions.json +++ b/versions.json @@ -213,61 +213,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "2eb8de746c0bc724bb5da4de52fc9660c2e866afc9a639ffdb1adfef2649cc0c", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-x86_64" + "sha256": "589f98f1395936170815282d77dbcb9935210536c769778aedd09c4ff5eec33b", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "ad707af427c3d3574c9e7dbc77915dcd06779a58e2c3b3783f7781166213454e", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv6" + "sha256": "3484cca874ef8eac4a81a020acbf8380dd9fa6176a1162a2591a42dd26d3d182", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "bd473fb4fcdb6ff9d1616d7ff3294387a574298083de91a36eed2741341f3c97", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv7" + "sha256": "03848bfe15f37fb078d6ad6f63183de985c837791e472b4e15e5768ab29ca84b", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d95d239bec166137a1ede1d441cb808da800dacc6041c966be35066aa96c6ee7", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-aarch64" + "sha256": "1301f1e1d94e9f03f39448c1bff5b14238770438f5c698e09ffaa7fad9969901", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "47d3b98679594041ecd5b972894b1ff6710b845224fef194af9922100c5b9275", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-darwin-x86_64" + "sha256": "00f7862dad89bb8acef7e8e57f1483a056728496353b4d881eecb36aa9888dbd", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "e2a2870e485431792ad9254950994e1c7637e97c90ad2191f209d3cc87e89de5", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-darwin-aarch64" + "sha256": "a50e36a960aec5bba34049b2e898f488410f1c38a15a84a8ae28d1c9aacae3df", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "72d4359904b6821b04b77f7dac609b994847838d1d38e5840362d64dc35d9bff", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-ppc64le" + "sha256": "756103706b378948e989d8aa7e4694a9d8691aabd73019064b57ad4315f6388a", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "34f859fd5b5d3f081a88004ad9a165b01f5b549abb76e0b99a3281bc963ebbde", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-riscv64" + "sha256": "6dca0ca98fdcbfbbf26318bf74bb7faf8f221201370f059c83dc554fe08fce23", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "d4f333a3abb6f4904e75e56196a3e6671797ef2f5e09cfbe71263f2dad466ea0", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-s390x" + "sha256": "6a43ae85495ceaa1b41f8958c1677ce0e25991f96b3bc47107f4af0e4db8927d", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe" + "sha256": "4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "48f758eaa0d08d5bb463dca435c6b5fe8c301102c31ce2ad53c4438241209a05", - "url": "https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-aarch64.exe" + "sha256": "3ad4b62cab1a54e61ee05946943fd8331897a4ead8dc1ff45f131cdf1a2d3463", + "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.4" + "version": "2.29.5" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From bd530b134ed9c16199a1c7a9d417676c91adc7ee Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 18 Sep 2024 09:05:47 -0700 Subject: [PATCH 405/667] Update 27-rc to 27.3.0-rc.2 --- 27-rc/cli/Dockerfile | 10 +++++----- 27-rc/dind-rootless/Dockerfile | 4 ++-- 27-rc/dind/Dockerfile | 8 ++++---- 27-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index 4d48abbd5..d02809953 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.3.0-rc.1 +ENV DOCKER_VERSION 27.3.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile index 818a0054f..9fd9f1495 100644 --- a/27-rc/dind-rootless/Dockerfile +++ b/27-rc/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/test/x86_64/docker-rootless-extras-27.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.3.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.3.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile index 064571f84..6b90e616f 100644 --- a/27-rc/dind/Dockerfile +++ b/27-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index 4f638d6c5..35fceebea 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/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 27.3.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.1.zip +ENV DOCKER_VERSION 27.3.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.2.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/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index ab04ef936..aa0c3e4b1 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/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 27.3.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.1.zip +ENV DOCKER_VERSION 27.3.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.2.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/versions.json b/versions.json index 52aba42c4..44da18913 100644 --- a/versions.json +++ b/versions.json @@ -142,21 +142,21 @@ "27-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.3.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.3.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.3.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.3.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.2.zip" } }, "buildx": { @@ -277,6 +277,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.3.0-rc.1" + "version": "27.3.0-rc.2" } } From 6f4ec6af74e399208c0d754381fb85fefcdfc577 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 19 Sep 2024 10:04:15 -0700 Subject: [PATCH 406/667] Update 27 to compose 2.29.6 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 24d3cd266..97fdb3099 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.5 +ENV DOCKER_COMPOSE_VERSION 2.29.6 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-x86_64'; \ - sha256='589f98f1395936170815282d77dbcb9935210536c769778aedd09c4ff5eec33b'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64'; \ + sha256='cbafe95cca26f77e9271978ad81387dd888eb36e9fdfad3e6fa3b173fcfe9dae'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv6'; \ - sha256='3484cca874ef8eac4a81a020acbf8380dd9fa6176a1162a2591a42dd26d3d182'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv6'; \ + sha256='3d999fa956f2da65b09584b1052c4cae5d5ea7b68e18dda27061e9eb8edc4150'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv7'; \ - sha256='03848bfe15f37fb078d6ad6f63183de985c837791e472b4e15e5768ab29ca84b'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv7'; \ + sha256='0a969be6d781f74248980f9b9e37a053ed9ec8b1a116dfc597510d953d316b70'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-aarch64'; \ - sha256='1301f1e1d94e9f03f39448c1bff5b14238770438f5c698e09ffaa7fad9969901'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-aarch64'; \ + sha256='fd39a8ad23303fc079449444a294ea4261f27ed55e22c0fb18a8a55cb550f7e1'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-ppc64le'; \ - sha256='756103706b378948e989d8aa7e4694a9d8691aabd73019064b57ad4315f6388a'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-ppc64le'; \ + sha256='d2097658b33f4de9840a0a66f77e33acf343b7d0f188c1723bd8bf5ec35aae4e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-riscv64'; \ - sha256='6dca0ca98fdcbfbbf26318bf74bb7faf8f221201370f059c83dc554fe08fce23'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-riscv64'; \ + sha256='a7474c04d13c909783fa785d5890e884905eb581de4cd5e65097354a73351a1a'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-s390x'; \ - sha256='6a43ae85495ceaa1b41f8958c1677ce0e25991f96b3bc47107f4af0e4db8927d'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-s390x'; \ + sha256='b4d7c14cc62356669881e5eb3545d1c4788db59442d48893cada062f2f78f059'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index d9577e37d..7ddd52f44 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.5 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7 +ENV DOCKER_COMPOSE_VERSION 2.29.6 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index e8165021c..bc5722d8a 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.5 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7 +ENV DOCKER_COMPOSE_VERSION 2.29.6 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 44da18913..6f4b30a1d 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "589f98f1395936170815282d77dbcb9935210536c769778aedd09c4ff5eec33b", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-x86_64" + "sha256": "cbafe95cca26f77e9271978ad81387dd888eb36e9fdfad3e6fa3b173fcfe9dae", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "3484cca874ef8eac4a81a020acbf8380dd9fa6176a1162a2591a42dd26d3d182", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv6" + "sha256": "3d999fa956f2da65b09584b1052c4cae5d5ea7b68e18dda27061e9eb8edc4150", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "03848bfe15f37fb078d6ad6f63183de985c837791e472b4e15e5768ab29ca84b", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv7" + "sha256": "0a969be6d781f74248980f9b9e37a053ed9ec8b1a116dfc597510d953d316b70", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "1301f1e1d94e9f03f39448c1bff5b14238770438f5c698e09ffaa7fad9969901", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-aarch64" + "sha256": "fd39a8ad23303fc079449444a294ea4261f27ed55e22c0fb18a8a55cb550f7e1", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "00f7862dad89bb8acef7e8e57f1483a056728496353b4d881eecb36aa9888dbd", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-darwin-x86_64" + "sha256": "d435ee68c0d73dbaced08921a3524d2c517f4dacd0a1a553e24db624c6cfbfa6", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "a50e36a960aec5bba34049b2e898f488410f1c38a15a84a8ae28d1c9aacae3df", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-darwin-aarch64" + "sha256": "978bb91420bb53d85925ce4bbeb6edc623a7ca716da9b1c30f3b801e16439739", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "756103706b378948e989d8aa7e4694a9d8691aabd73019064b57ad4315f6388a", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-ppc64le" + "sha256": "d2097658b33f4de9840a0a66f77e33acf343b7d0f188c1723bd8bf5ec35aae4e", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "6dca0ca98fdcbfbbf26318bf74bb7faf8f221201370f059c83dc554fe08fce23", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-riscv64" + "sha256": "a7474c04d13c909783fa785d5890e884905eb581de4cd5e65097354a73351a1a", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6a43ae85495ceaa1b41f8958c1677ce0e25991f96b3bc47107f4af0e4db8927d", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-s390x" + "sha256": "b4d7c14cc62356669881e5eb3545d1c4788db59442d48893cada062f2f78f059", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe" + "sha256": "0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "3ad4b62cab1a54e61ee05946943fd8331897a4ead8dc1ff45f131cdf1a2d3463", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-aarch64.exe" + "sha256": "2c38f9c7fd44a3378171cf6d2cdd17f08b9a383624d4ab9022cd1f390fc105b1", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.5" + "version": "2.29.6" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From e2a1a18baf6cab53d9fdce673d00da784d4906b4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 19 Sep 2024 10:06:09 -0700 Subject: [PATCH 407/667] Update 27-rc to compose 2.29.6 --- 27-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index d02809953..66189fc29 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.5 +ENV DOCKER_COMPOSE_VERSION 2.29.6 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-x86_64'; \ - sha256='589f98f1395936170815282d77dbcb9935210536c769778aedd09c4ff5eec33b'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64'; \ + sha256='cbafe95cca26f77e9271978ad81387dd888eb36e9fdfad3e6fa3b173fcfe9dae'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv6'; \ - sha256='3484cca874ef8eac4a81a020acbf8380dd9fa6176a1162a2591a42dd26d3d182'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv6'; \ + sha256='3d999fa956f2da65b09584b1052c4cae5d5ea7b68e18dda27061e9eb8edc4150'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv7'; \ - sha256='03848bfe15f37fb078d6ad6f63183de985c837791e472b4e15e5768ab29ca84b'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv7'; \ + sha256='0a969be6d781f74248980f9b9e37a053ed9ec8b1a116dfc597510d953d316b70'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-aarch64'; \ - sha256='1301f1e1d94e9f03f39448c1bff5b14238770438f5c698e09ffaa7fad9969901'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-aarch64'; \ + sha256='fd39a8ad23303fc079449444a294ea4261f27ed55e22c0fb18a8a55cb550f7e1'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-ppc64le'; \ - sha256='756103706b378948e989d8aa7e4694a9d8691aabd73019064b57ad4315f6388a'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-ppc64le'; \ + sha256='d2097658b33f4de9840a0a66f77e33acf343b7d0f188c1723bd8bf5ec35aae4e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-riscv64'; \ - sha256='6dca0ca98fdcbfbbf26318bf74bb7faf8f221201370f059c83dc554fe08fce23'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-riscv64'; \ + sha256='a7474c04d13c909783fa785d5890e884905eb581de4cd5e65097354a73351a1a'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-s390x'; \ - sha256='6a43ae85495ceaa1b41f8958c1677ce0e25991f96b3bc47107f4af0e4db8927d'; \ + url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-s390x'; \ + sha256='b4d7c14cc62356669881e5eb3545d1c4788db59442d48893cada062f2f78f059'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index 35fceebea..23019c4f8 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.5 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7 +ENV DOCKER_COMPOSE_VERSION 2.29.6 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index aa0c3e4b1..599545b97 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.5 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7 +ENV DOCKER_COMPOSE_VERSION 2.29.6 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6f4b30a1d..8da9203d8 100644 --- a/versions.json +++ b/versions.json @@ -213,61 +213,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "589f98f1395936170815282d77dbcb9935210536c769778aedd09c4ff5eec33b", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-x86_64" + "sha256": "cbafe95cca26f77e9271978ad81387dd888eb36e9fdfad3e6fa3b173fcfe9dae", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "3484cca874ef8eac4a81a020acbf8380dd9fa6176a1162a2591a42dd26d3d182", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv6" + "sha256": "3d999fa956f2da65b09584b1052c4cae5d5ea7b68e18dda27061e9eb8edc4150", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "03848bfe15f37fb078d6ad6f63183de985c837791e472b4e15e5768ab29ca84b", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv7" + "sha256": "0a969be6d781f74248980f9b9e37a053ed9ec8b1a116dfc597510d953d316b70", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "1301f1e1d94e9f03f39448c1bff5b14238770438f5c698e09ffaa7fad9969901", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-aarch64" + "sha256": "fd39a8ad23303fc079449444a294ea4261f27ed55e22c0fb18a8a55cb550f7e1", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "00f7862dad89bb8acef7e8e57f1483a056728496353b4d881eecb36aa9888dbd", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-darwin-x86_64" + "sha256": "d435ee68c0d73dbaced08921a3524d2c517f4dacd0a1a553e24db624c6cfbfa6", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "a50e36a960aec5bba34049b2e898f488410f1c38a15a84a8ae28d1c9aacae3df", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-darwin-aarch64" + "sha256": "978bb91420bb53d85925ce4bbeb6edc623a7ca716da9b1c30f3b801e16439739", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "756103706b378948e989d8aa7e4694a9d8691aabd73019064b57ad4315f6388a", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-ppc64le" + "sha256": "d2097658b33f4de9840a0a66f77e33acf343b7d0f188c1723bd8bf5ec35aae4e", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "6dca0ca98fdcbfbbf26318bf74bb7faf8f221201370f059c83dc554fe08fce23", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-riscv64" + "sha256": "a7474c04d13c909783fa785d5890e884905eb581de4cd5e65097354a73351a1a", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6a43ae85495ceaa1b41f8958c1677ce0e25991f96b3bc47107f4af0e4db8927d", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-s390x" + "sha256": "b4d7c14cc62356669881e5eb3545d1c4788db59442d48893cada062f2f78f059", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe" + "sha256": "0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "3ad4b62cab1a54e61ee05946943fd8331897a4ead8dc1ff45f131cdf1a2d3463", - "url": "https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-aarch64.exe" + "sha256": "2c38f9c7fd44a3378171cf6d2cdd17f08b9a383624d4ab9022cd1f390fc105b1", + "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.5" + "version": "2.29.6" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 21b87062452c5525f054e46fb9dc998d0601bfb3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 19 Sep 2024 13:03:59 -0700 Subject: [PATCH 408/667] Update 27 to 27.3.0 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 97fdb3099..bb56d8319 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.2.1 +ENV DOCKER_VERSION 27.3.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.3.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index 18070cf0f..002b09c70 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.3.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.3.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index da89cc880..bc653e0e2 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.3.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 7ddd52f44..33d9ab2b2 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.2.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.2.1.zip +ENV DOCKER_VERSION 27.3.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.0.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index bc5722d8a..ad705384c 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.2.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.2.1.zip +ENV DOCKER_VERSION 27.3.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.0.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/versions.json b/versions.json index 8da9203d8..423edbaf6 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.2.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.3.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.3.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.3.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.3.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.2.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.3.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.3.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.2.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.3.0.zip" } }, "buildx": { @@ -137,7 +137,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.2.1" + "version": "27.3.0" }, "27-rc": { "arches": { From 00c95d9cb60156c29657f2af60e26aca9150c71e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 19 Sep 2024 13:06:01 -0700 Subject: [PATCH 409/667] Update 27-rc --- 27-rc/cli/Dockerfile | 167 ------------- 27-rc/cli/docker-entrypoint.sh | 61 ----- 27-rc/cli/modprobe.sh | 20 -- 27-rc/dind-rootless/Dockerfile | 55 ---- 27-rc/dind/Dockerfile | 108 -------- 27-rc/dind/dockerd-entrypoint.sh | 234 ------------------ .../windows/windowsservercore-1809/Dockerfile | 91 ------- .../windowsservercore-ltsc2022/Dockerfile | 91 ------- versions.json | 141 +---------- 9 files changed, 1 insertion(+), 967 deletions(-) delete mode 100644 27-rc/cli/Dockerfile delete mode 100755 27-rc/cli/docker-entrypoint.sh delete mode 100755 27-rc/cli/modprobe.sh delete mode 100644 27-rc/dind-rootless/Dockerfile delete mode 100644 27-rc/dind/Dockerfile delete mode 100755 27-rc/dind/dockerd-entrypoint.sh delete mode 100644 27-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 27-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile deleted file mode 100644 index 66189fc29..000000000 --- a/27-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.20 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 27.3.0-rc.2 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.17.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-amd64'; \ - sha256='aa7a9778349e1a8ace685e4c51a1d33e7a9b0aa6925d1c625b09cb3800eba696'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v6'; \ - sha256='8c287b02430036d42323052e228ee8e26a6e7f7c5858b170f6f82be812d8043b'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v7'; \ - sha256='5454c2feddb76000c22cb8abafe8f4a03e6fee12aae9031f9e02b661e76012c8'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm64'; \ - sha256='de05dccd47932eb9fd6e63781ab29d2b0b2c834bbdd19b51d7ea452b1fe378d3'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-ppc64le'; \ - sha256='29b4f2de5a1e6ecb4096868111d693a8ba4aaf144d535242ce19fc4154f94a4e'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-riscv64'; \ - sha256='e67d26acb10c4529b9b5ca4e20781865d63e538228c566af6d1e91da65cdb992'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-s390x'; \ - sha256='9a3a4376025d1c2771ac69aceff0bcb19a2594413e318a34455af037ce903f06'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.29.6 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64'; \ - sha256='cbafe95cca26f77e9271978ad81387dd888eb36e9fdfad3e6fa3b173fcfe9dae'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv6'; \ - sha256='3d999fa956f2da65b09584b1052c4cae5d5ea7b68e18dda27061e9eb8edc4150'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv7'; \ - sha256='0a969be6d781f74248980f9b9e37a053ed9ec8b1a116dfc597510d953d316b70'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-aarch64'; \ - sha256='fd39a8ad23303fc079449444a294ea4261f27ed55e22c0fb18a8a55cb550f7e1'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-ppc64le'; \ - sha256='d2097658b33f4de9840a0a66f77e33acf343b7d0f188c1723bd8bf5ec35aae4e'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-riscv64'; \ - sha256='a7474c04d13c909783fa785d5890e884905eb581de4cd5e65097354a73351a1a'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-s390x'; \ - sha256='b4d7c14cc62356669881e5eb3545d1c4788db59442d48893cada062f2f78f059'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/27-rc/cli/docker-entrypoint.sh b/27-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/27-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/27-rc/cli/modprobe.sh b/27-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/27-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile deleted file mode 100644 index 9fd9f1495..000000000 --- a/27-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.3.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.3.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile deleted file mode 100644 index 6b90e616f..000000000 --- a/27-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 - b="/sbin/${f/tables/tables-legacy}"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:27-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/27-rc/dind/dockerd-entrypoint.sh b/27-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 6c06bb811..000000000 --- a/27-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 23019c4f8..000000000 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.3.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.17.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.6 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 599545b97..000000000 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.3.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.17.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.6 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 423edbaf6..be35ecfac 100644 --- a/versions.json +++ b/versions.json @@ -139,144 +139,5 @@ ], "version": "27.3.0" }, - "27-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.3.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.3.0-rc.2.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.3.0-rc.2.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.3.0-rc.2.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.3.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.3.0-rc.2.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.3.0-rc.2.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.17.1.linux-amd64", - "sha256": "aa7a9778349e1a8ace685e4c51a1d33e7a9b0aa6925d1c625b09cb3800eba696", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.17.1.linux-arm-v6", - "sha256": "8c287b02430036d42323052e228ee8e26a6e7f7c5858b170f6f82be812d8043b", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.17.1.linux-arm-v7", - "sha256": "5454c2feddb76000c22cb8abafe8f4a03e6fee12aae9031f9e02b661e76012c8", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.17.1.linux-arm64", - "sha256": "de05dccd47932eb9fd6e63781ab29d2b0b2c834bbdd19b51d7ea452b1fe378d3", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm64" - }, - "ppc64le": { - "file": "buildx-v0.17.1.linux-ppc64le", - "sha256": "29b4f2de5a1e6ecb4096868111d693a8ba4aaf144d535242ce19fc4154f94a4e", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.17.1.linux-riscv64", - "sha256": "e67d26acb10c4529b9b5ca4e20781865d63e538228c566af6d1e91da65cdb992", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.17.1.linux-s390x", - "sha256": "9a3a4376025d1c2771ac69aceff0bcb19a2594413e318a34455af037ce903f06", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.17.1.windows-amd64.exe", - "sha256": "8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.17.1.windows-arm64.exe", - "sha256": "e9c302fb36d16ba8df5488f536a66966f807c4342efc59f5b669d31cd0370d67", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-arm64.exe" - } - }, - "version": "0.17.1" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "cbafe95cca26f77e9271978ad81387dd888eb36e9fdfad3e6fa3b173fcfe9dae", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "3d999fa956f2da65b09584b1052c4cae5d5ea7b68e18dda27061e9eb8edc4150", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "0a969be6d781f74248980f9b9e37a053ed9ec8b1a116dfc597510d953d316b70", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "fd39a8ad23303fc079449444a294ea4261f27ed55e22c0fb18a8a55cb550f7e1", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "d435ee68c0d73dbaced08921a3524d2c517f4dacd0a1a553e24db624c6cfbfa6", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "978bb91420bb53d85925ce4bbeb6edc623a7ca716da9b1c30f3b801e16439739", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "d2097658b33f4de9840a0a66f77e33acf343b7d0f188c1723bd8bf5ec35aae4e", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "a7474c04d13c909783fa785d5890e884905eb581de4cd5e65097354a73351a1a", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "b4d7c14cc62356669881e5eb3545d1c4788db59442d48893cada062f2f78f059", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "2c38f9c7fd44a3378171cf6d2cdd17f08b9a383624d4ab9022cd1f390fc105b1", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.29.6" - }, - "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "27.3.0-rc.2" - } + "27-rc": null } From fa5b61523d780d83e8ef83387785e007bd7c3c78 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 20 Sep 2024 04:04:16 -0700 Subject: [PATCH 410/667] Update 27 to compose 2.29.7 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index bb56d8319..9ebea2abe 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.6 +ENV DOCKER_COMPOSE_VERSION 2.29.7 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64'; \ - sha256='cbafe95cca26f77e9271978ad81387dd888eb36e9fdfad3e6fa3b173fcfe9dae'; \ + url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-x86_64'; \ + sha256='383ce6698cd5d5bbf958d2c8489ed75094e34a77d340404d9f32c4ae9e12baf0'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv6'; \ - sha256='3d999fa956f2da65b09584b1052c4cae5d5ea7b68e18dda27061e9eb8edc4150'; \ + url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-armv6'; \ + sha256='10ee0856a65f5b5aa0e2d5711ffd61b20f7dddc5c1b5eafe81bb7e9699898c9f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv7'; \ - sha256='0a969be6d781f74248980f9b9e37a053ed9ec8b1a116dfc597510d953d316b70'; \ + url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-armv7'; \ + sha256='2aadddeee7cc43ff9f9bac4a096c1310b65d1a4543a0ae2f1bfdc725534f9725'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-aarch64'; \ - sha256='fd39a8ad23303fc079449444a294ea4261f27ed55e22c0fb18a8a55cb550f7e1'; \ + url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-aarch64'; \ + sha256='6e9fbd5daa20dca5d7d89145081ae8155d68ef2928b497d9f85b54fe0f9dbb2c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-ppc64le'; \ - sha256='d2097658b33f4de9840a0a66f77e33acf343b7d0f188c1723bd8bf5ec35aae4e'; \ + url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-ppc64le'; \ + sha256='ad83e20755fcf6ff53da61fd42602ec3224588172f4345bc926bc3521f36d513'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-riscv64'; \ - sha256='a7474c04d13c909783fa785d5890e884905eb581de4cd5e65097354a73351a1a'; \ + url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-riscv64'; \ + sha256='6230041e4805a28d1f7e16a9c3f6ccee4f880ecdd7eec7abbbd97f14a2ad4718'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-s390x'; \ - sha256='b4d7c14cc62356669881e5eb3545d1c4788db59442d48893cada062f2f78f059'; \ + url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-s390x'; \ + sha256='4d5481de21f929a9403a8186de85184bb4bea3ff8e825c92329f4e98a5b07f72'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 33d9ab2b2..6c0804c26 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.6 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1 +ENV DOCKER_COMPOSE_VERSION 2.29.7 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a87a6464ef717ff193ac01211f0de8893866e53c01ef7514f2f9fc54addd2abd RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index ad705384c..4c97af156 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.6 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1 +ENV DOCKER_COMPOSE_VERSION 2.29.7 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a87a6464ef717ff193ac01211f0de8893866e53c01ef7514f2f9fc54addd2abd RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index be35ecfac..67894bddd 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "cbafe95cca26f77e9271978ad81387dd888eb36e9fdfad3e6fa3b173fcfe9dae", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64" + "sha256": "383ce6698cd5d5bbf958d2c8489ed75094e34a77d340404d9f32c4ae9e12baf0", + "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "3d999fa956f2da65b09584b1052c4cae5d5ea7b68e18dda27061e9eb8edc4150", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv6" + "sha256": "10ee0856a65f5b5aa0e2d5711ffd61b20f7dddc5c1b5eafe81bb7e9699898c9f", + "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "0a969be6d781f74248980f9b9e37a053ed9ec8b1a116dfc597510d953d316b70", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-armv7" + "sha256": "2aadddeee7cc43ff9f9bac4a096c1310b65d1a4543a0ae2f1bfdc725534f9725", + "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "fd39a8ad23303fc079449444a294ea4261f27ed55e22c0fb18a8a55cb550f7e1", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-aarch64" + "sha256": "6e9fbd5daa20dca5d7d89145081ae8155d68ef2928b497d9f85b54fe0f9dbb2c", + "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "d435ee68c0d73dbaced08921a3524d2c517f4dacd0a1a553e24db624c6cfbfa6", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-darwin-x86_64" + "sha256": "239a547f2695e49fac5cc4f27af864f7c7c4a17c741b85a8607635f0631fbcd9", + "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "978bb91420bb53d85925ce4bbeb6edc623a7ca716da9b1c30f3b801e16439739", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-darwin-aarch64" + "sha256": "12280cff0940035e1850b475e4972bcded09307a305a0b126ec70a3e6203ed34", + "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "d2097658b33f4de9840a0a66f77e33acf343b7d0f188c1723bd8bf5ec35aae4e", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-ppc64le" + "sha256": "ad83e20755fcf6ff53da61fd42602ec3224588172f4345bc926bc3521f36d513", + "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "a7474c04d13c909783fa785d5890e884905eb581de4cd5e65097354a73351a1a", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-riscv64" + "sha256": "6230041e4805a28d1f7e16a9c3f6ccee4f880ecdd7eec7abbbd97f14a2ad4718", + "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "b4d7c14cc62356669881e5eb3545d1c4788db59442d48893cada062f2f78f059", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-s390x" + "sha256": "4d5481de21f929a9403a8186de85184bb4bea3ff8e825c92329f4e98a5b07f72", + "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0ead495cd4b275bf4988fc04635ee5e603853ff4b494b6dc13c3127fe03919d1", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-x86_64.exe" + "sha256": "a87a6464ef717ff193ac01211f0de8893866e53c01ef7514f2f9fc54addd2abd", + "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2c38f9c7fd44a3378171cf6d2cdd17f08b9a383624d4ab9022cd1f390fc105b1", - "url": "https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-windows-aarch64.exe" + "sha256": "c0bd633183859aeb5efdeccd7c8e720c26d7ce3bb3b763e5c7d21ffccd6375d7", + "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.6" + "version": "2.29.7" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 97331ed1dd7c07dd5aa852e01aa5deff5d2aed09 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 20 Sep 2024 11:21:55 -0700 Subject: [PATCH 411/667] Update 27 to 27.3.1 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 9ebea2abe..7c6ecf142 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.3.0 +ENV DOCKER_VERSION 27.3.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.3.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index 002b09c70..7cd245d36 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.3.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.3.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index bc653e0e2..991bbb7c1 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.3.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 6c0804c26..32a9f4c80 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.3.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.0.zip +ENV DOCKER_VERSION 27.3.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.1.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 4c97af156..4554c612b 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.3.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.0.zip +ENV DOCKER_VERSION 27.3.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.1.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/versions.json b/versions.json index 67894bddd..917f9357a 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.3.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.3.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.3.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.3.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.3.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.3.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.3.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.3.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.3.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.3.1.zip" } }, "buildx": { @@ -137,7 +137,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.3.0" + "version": "27.3.1" }, "27-rc": null } From 9f57f3fb1ef688e231b911e0b414da241804c511 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 30 Sep 2024 11:28:39 -0700 Subject: [PATCH 412/667] Update `generate-stackbrew-library.sh` to support `BASHBREW_LIBRARY` for easier cascading updates See https://github.com/docker-library/official-images/pull/17640#issuecomment-2380308790 --- generate-stackbrew-library.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 11e3c9199..920da3058 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -40,17 +40,19 @@ dirCommit() { getArches() { local repo="$1"; shift - local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/' + local officialImagesBase="${BASHBREW_LIBRARY:-https://github.com/docker-library/official-images/raw/HEAD/library}/" - eval "declare -A -g parentRepoToArches=( $( - find -name 'Dockerfile' -exec awk ' + local parentRepoToArchesStr + parentRepoToArchesStr="$( + find -name 'Dockerfile' -exec awk -v officialImagesBase="$officialImagesBase" ' toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|.*\/.*)(:|$)/ { - print "'"$officialImagesUrl"'" $2 + printf "%s%s\n", officialImagesBase, $2 } ' '{}' + \ | sort -u \ - | xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"' - ) )" + | xargs -r bashbrew cat --format '["{{ .RepoName }}:{{ .TagName }}"]="{{ join " " .TagEntry.Architectures }}"' + )" + eval "declare -g -A parentRepoToArches=( $parentRepoToArchesStr )" } getArches 'docker' From 2d6a55c8a243dd79115ab0dbc6b40533d536c08b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 29 Oct 2024 10:04:16 -0700 Subject: [PATCH 413/667] Update 27 to compose 2.30.0 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 7c6ecf142..e96418abd 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.29.7 +ENV DOCKER_COMPOSE_VERSION 2.30.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-x86_64'; \ - sha256='383ce6698cd5d5bbf958d2c8489ed75094e34a77d340404d9f32c4ae9e12baf0'; \ + url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-x86_64'; \ + sha256='1cddcb3399cc68c385796a6ab441ab5734d4c6a0cb4713bd2bf3f0d384550a38'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-armv6'; \ - sha256='10ee0856a65f5b5aa0e2d5711ffd61b20f7dddc5c1b5eafe81bb7e9699898c9f'; \ + url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-armv6'; \ + sha256='e8aa55c053feee38474d97150d908268b666915160a8e588ca2938350a3b7dee'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-armv7'; \ - sha256='2aadddeee7cc43ff9f9bac4a096c1310b65d1a4543a0ae2f1bfdc725534f9725'; \ + url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-armv7'; \ + sha256='3dc0b1bea00ca66cd17cdc0200a9a2f7441d501598de58bb3621c5e04da7b1d3'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-aarch64'; \ - sha256='6e9fbd5daa20dca5d7d89145081ae8155d68ef2928b497d9f85b54fe0f9dbb2c'; \ + url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-aarch64'; \ + sha256='06a8dee876dcae79c6b0923b73b16fcc12b003b05556533079b27e24306e88b9'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-ppc64le'; \ - sha256='ad83e20755fcf6ff53da61fd42602ec3224588172f4345bc926bc3521f36d513'; \ + url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-ppc64le'; \ + sha256='2ba0a78a2c56576389c9ff6f8d501e8385c2ed99ec9634f852c668e56cf7487d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-riscv64'; \ - sha256='6230041e4805a28d1f7e16a9c3f6ccee4f880ecdd7eec7abbbd97f14a2ad4718'; \ + url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-riscv64'; \ + sha256='8aa7eeff2e25561691e3a653913d7d2f5dd23791c7674967b1e0498f73f74c54'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-s390x'; \ - sha256='4d5481de21f929a9403a8186de85184bb4bea3ff8e825c92329f4e98a5b07f72'; \ + url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-s390x'; \ + sha256='431425d29c149d21d67a4e5ddc9490dc92c256ef52f8034903481a3d848e410c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 32a9f4c80..879c9dd9c 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.7 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a87a6464ef717ff193ac01211f0de8893866e53c01ef7514f2f9fc54addd2abd +ENV DOCKER_COMPOSE_VERSION 2.30.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 07ed10572bed0c42e5477bd33f9eb8f1b1c640d83120cc59feb7ce28f0c1bf86 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 4554c612b..f56b4bedb 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.29.7 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a87a6464ef717ff193ac01211f0de8893866e53c01ef7514f2f9fc54addd2abd +ENV DOCKER_COMPOSE_VERSION 2.30.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 07ed10572bed0c42e5477bd33f9eb8f1b1c640d83120cc59feb7ce28f0c1bf86 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 917f9357a..425039649 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "383ce6698cd5d5bbf958d2c8489ed75094e34a77d340404d9f32c4ae9e12baf0", - "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-x86_64" + "sha256": "1cddcb3399cc68c385796a6ab441ab5734d4c6a0cb4713bd2bf3f0d384550a38", + "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "10ee0856a65f5b5aa0e2d5711ffd61b20f7dddc5c1b5eafe81bb7e9699898c9f", - "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-armv6" + "sha256": "e8aa55c053feee38474d97150d908268b666915160a8e588ca2938350a3b7dee", + "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "2aadddeee7cc43ff9f9bac4a096c1310b65d1a4543a0ae2f1bfdc725534f9725", - "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-armv7" + "sha256": "3dc0b1bea00ca66cd17cdc0200a9a2f7441d501598de58bb3621c5e04da7b1d3", + "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "6e9fbd5daa20dca5d7d89145081ae8155d68ef2928b497d9f85b54fe0f9dbb2c", - "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-aarch64" + "sha256": "06a8dee876dcae79c6b0923b73b16fcc12b003b05556533079b27e24306e88b9", + "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "239a547f2695e49fac5cc4f27af864f7c7c4a17c741b85a8607635f0631fbcd9", - "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-darwin-x86_64" + "sha256": "a2359d75ae1ff86150daf530dcb156bfb38c41d106e6db793bb9a6ac63d84fa9", + "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "12280cff0940035e1850b475e4972bcded09307a305a0b126ec70a3e6203ed34", - "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-darwin-aarch64" + "sha256": "01f84aa5d2b81a75d001e986986bf948fbbbdff4b98827ab1dd14a874d04ca4a", + "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "ad83e20755fcf6ff53da61fd42602ec3224588172f4345bc926bc3521f36d513", - "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-ppc64le" + "sha256": "2ba0a78a2c56576389c9ff6f8d501e8385c2ed99ec9634f852c668e56cf7487d", + "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "6230041e4805a28d1f7e16a9c3f6ccee4f880ecdd7eec7abbbd97f14a2ad4718", - "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-riscv64" + "sha256": "8aa7eeff2e25561691e3a653913d7d2f5dd23791c7674967b1e0498f73f74c54", + "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "4d5481de21f929a9403a8186de85184bb4bea3ff8e825c92329f4e98a5b07f72", - "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-linux-s390x" + "sha256": "431425d29c149d21d67a4e5ddc9490dc92c256ef52f8034903481a3d848e410c", + "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "a87a6464ef717ff193ac01211f0de8893866e53c01ef7514f2f9fc54addd2abd", - "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-windows-x86_64.exe" + "sha256": "07ed10572bed0c42e5477bd33f9eb8f1b1c640d83120cc59feb7ce28f0c1bf86", + "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "c0bd633183859aeb5efdeccd7c8e720c26d7ce3bb3b763e5c7d21ffccd6375d7", - "url": "https://github.com/docker/compose/releases/download/v2.29.7/docker-compose-windows-aarch64.exe" + "sha256": "e8e17e4a8e0b130f7f0900220ac1e7cd4af1252f4a971254dc01960bde0527fa", + "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.29.7" + "version": "2.30.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 48d1736c15a79fd1c38b28acfd3ee48f4db2b421 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 30 Oct 2024 04:04:17 -0700 Subject: [PATCH 414/667] Update 27 to compose 2.30.1 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index e96418abd..3f6e5eca9 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.30.0 +ENV DOCKER_COMPOSE_VERSION 2.30.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-x86_64'; \ - sha256='1cddcb3399cc68c385796a6ab441ab5734d4c6a0cb4713bd2bf3f0d384550a38'; \ + url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-x86_64'; \ + sha256='bd976a501e471c14b320876686f1628db3c37ab223405d2a815022fc711e704e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-armv6'; \ - sha256='e8aa55c053feee38474d97150d908268b666915160a8e588ca2938350a3b7dee'; \ + url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-armv6'; \ + sha256='2c70bd6e01ceb550d81a1bb0981f8f24c58ec301ac0c1432db132e07842544fe'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-armv7'; \ - sha256='3dc0b1bea00ca66cd17cdc0200a9a2f7441d501598de58bb3621c5e04da7b1d3'; \ + url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-armv7'; \ + sha256='205f947e00fdfb2d4787fb5d38267d56e68bbf07757d8e30d7b1c9c1086c8477'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-aarch64'; \ - sha256='06a8dee876dcae79c6b0923b73b16fcc12b003b05556533079b27e24306e88b9'; \ + url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-aarch64'; \ + sha256='f869d0900f8744b3f295c5bf8ed68488110598891d3db1d93db7203db9fa535b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-ppc64le'; \ - sha256='2ba0a78a2c56576389c9ff6f8d501e8385c2ed99ec9634f852c668e56cf7487d'; \ + url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-ppc64le'; \ + sha256='93e47b53fcaaa366555cfa92ff49c77c16e2d76ccf26f816db24683b6bdb36ac'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-riscv64'; \ - sha256='8aa7eeff2e25561691e3a653913d7d2f5dd23791c7674967b1e0498f73f74c54'; \ + url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-riscv64'; \ + sha256='0431d523628c26e74308be72205d13866bc978970b2e98efc60f5ecf23089ed2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-s390x'; \ - sha256='431425d29c149d21d67a4e5ddc9490dc92c256ef52f8034903481a3d848e410c'; \ + url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-s390x'; \ + sha256='afed38f2f18219d3fe79f2f0bc11d21458195c7f19d812c3ecd1a2608094fa84'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 879c9dd9c..2719fd755 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.30.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 07ed10572bed0c42e5477bd33f9eb8f1b1c640d83120cc59feb7ce28f0c1bf86 +ENV DOCKER_COMPOSE_VERSION 2.30.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bf29dcf1b35cf226ca0fe337d0de903060ec50855eea5c0eb54739e3c3c3fa5a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index f56b4bedb..383df4161 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.30.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 07ed10572bed0c42e5477bd33f9eb8f1b1c640d83120cc59feb7ce28f0c1bf86 +ENV DOCKER_COMPOSE_VERSION 2.30.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bf29dcf1b35cf226ca0fe337d0de903060ec50855eea5c0eb54739e3c3c3fa5a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 425039649..fe0580d1a 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "1cddcb3399cc68c385796a6ab441ab5734d4c6a0cb4713bd2bf3f0d384550a38", - "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-x86_64" + "sha256": "bd976a501e471c14b320876686f1628db3c37ab223405d2a815022fc711e704e", + "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e8aa55c053feee38474d97150d908268b666915160a8e588ca2938350a3b7dee", - "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-armv6" + "sha256": "2c70bd6e01ceb550d81a1bb0981f8f24c58ec301ac0c1432db132e07842544fe", + "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "3dc0b1bea00ca66cd17cdc0200a9a2f7441d501598de58bb3621c5e04da7b1d3", - "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-armv7" + "sha256": "205f947e00fdfb2d4787fb5d38267d56e68bbf07757d8e30d7b1c9c1086c8477", + "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "06a8dee876dcae79c6b0923b73b16fcc12b003b05556533079b27e24306e88b9", - "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-aarch64" + "sha256": "f869d0900f8744b3f295c5bf8ed68488110598891d3db1d93db7203db9fa535b", + "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "a2359d75ae1ff86150daf530dcb156bfb38c41d106e6db793bb9a6ac63d84fa9", - "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-darwin-x86_64" + "sha256": "37df4a6d3045ee68b47e1701cbe1b2f6c8c82d9c0dddb615b8da62f3223fd135", + "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "01f84aa5d2b81a75d001e986986bf948fbbbdff4b98827ab1dd14a874d04ca4a", - "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-darwin-aarch64" + "sha256": "589dcbe897e74b1ef4f6eef20e0750efff2bbca7a7009daf37d760a3f453f72b", + "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "2ba0a78a2c56576389c9ff6f8d501e8385c2ed99ec9634f852c668e56cf7487d", - "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-ppc64le" + "sha256": "93e47b53fcaaa366555cfa92ff49c77c16e2d76ccf26f816db24683b6bdb36ac", + "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "8aa7eeff2e25561691e3a653913d7d2f5dd23791c7674967b1e0498f73f74c54", - "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-riscv64" + "sha256": "0431d523628c26e74308be72205d13866bc978970b2e98efc60f5ecf23089ed2", + "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "431425d29c149d21d67a4e5ddc9490dc92c256ef52f8034903481a3d848e410c", - "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-linux-s390x" + "sha256": "afed38f2f18219d3fe79f2f0bc11d21458195c7f19d812c3ecd1a2608094fa84", + "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "07ed10572bed0c42e5477bd33f9eb8f1b1c640d83120cc59feb7ce28f0c1bf86", - "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-windows-x86_64.exe" + "sha256": "bf29dcf1b35cf226ca0fe337d0de903060ec50855eea5c0eb54739e3c3c3fa5a", + "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "e8e17e4a8e0b130f7f0900220ac1e7cd4af1252f4a971254dc01960bde0527fa", - "url": "https://github.com/docker/compose/releases/download/v2.30.0/docker-compose-windows-aarch64.exe" + "sha256": "85a61b020123b539ca9c41b21e76d348acc4a8ab3b0cea61ed144b8fa4a84240", + "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.30.0" + "version": "2.30.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From e4f50f81c8421f07f3e4b546c8b5313bd0042ef5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 30 Oct 2024 16:04:15 -0700 Subject: [PATCH 415/667] Update 27 to buildx 0.18.0 --- 27/cli/Dockerfile | 30 +++++----- 27/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 56 +++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 3f6e5eca9..03addd490 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.17.1 +ENV DOCKER_BUILDX_VERSION 0.18.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-amd64'; \ - sha256='aa7a9778349e1a8ace685e4c51a1d33e7a9b0aa6925d1c625b09cb3800eba696'; \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-amd64'; \ + sha256='4fe2eb90ac22b27fa03734899fcf814aa1e214a4952b9b30b20d551baf1d9a5c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v6'; \ - sha256='8c287b02430036d42323052e228ee8e26a6e7f7c5858b170f6f82be812d8043b'; \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v6'; \ + sha256='f438c1845f515b7deda0d7f325752f5652f2206a34ab2fff611f8a8717fb8907'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v7'; \ - sha256='5454c2feddb76000c22cb8abafe8f4a03e6fee12aae9031f9e02b661e76012c8'; \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v7'; \ + sha256='606e449ac112615e0bffe6c433e59e84145e6963119ea397227381b86da3a880'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm64'; \ - sha256='de05dccd47932eb9fd6e63781ab29d2b0b2c834bbdd19b51d7ea452b1fe378d3'; \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm64'; \ + sha256='da9742321bb462547ebde69bf8420ac07b2a2c80fb57260f539bfc9f312becd6'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-ppc64le'; \ - sha256='29b4f2de5a1e6ecb4096868111d693a8ba4aaf144d535242ce19fc4154f94a4e'; \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-ppc64le'; \ + sha256='ef63b95d022c53b41b2404aef7ca77c2e775f2be63566d2af00260ed13c51984'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-riscv64'; \ - sha256='e67d26acb10c4529b9b5ca4e20781865d63e538228c566af6d1e91da65cdb992'; \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-riscv64'; \ + sha256='49dd68603c992b6755fc7c8a7762fbbe689f2aca97a55a513c978e02582f9a81'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-s390x'; \ - sha256='9a3a4376025d1c2771ac69aceff0bcb19a2594413e318a34455af037ce903f06'; \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-s390x'; \ + sha256='f4a69adac9a2734ab191c29529f54012b289884b626d75baa3cf0471b0241f58'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 2719fd755..34ad5e374 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.17.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc +ENV DOCKER_BUILDX_VERSION 0.18.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 383df4161..f98b64114 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.17.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc +ENV DOCKER_BUILDX_VERSION 0.18.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index fe0580d1a..b41595b9a 100644 --- a/versions.json +++ b/versions.json @@ -22,52 +22,52 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.17.1.linux-amd64", - "sha256": "aa7a9778349e1a8ace685e4c51a1d33e7a9b0aa6925d1c625b09cb3800eba696", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-amd64" + "file": "buildx-v0.18.0.linux-amd64", + "sha256": "4fe2eb90ac22b27fa03734899fcf814aa1e214a4952b9b30b20d551baf1d9a5c", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.17.1.linux-arm-v6", - "sha256": "8c287b02430036d42323052e228ee8e26a6e7f7c5858b170f6f82be812d8043b", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v6" + "file": "buildx-v0.18.0.linux-arm-v6", + "sha256": "f438c1845f515b7deda0d7f325752f5652f2206a34ab2fff611f8a8717fb8907", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.17.1.linux-arm-v7", - "sha256": "5454c2feddb76000c22cb8abafe8f4a03e6fee12aae9031f9e02b661e76012c8", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm-v7" + "file": "buildx-v0.18.0.linux-arm-v7", + "sha256": "606e449ac112615e0bffe6c433e59e84145e6963119ea397227381b86da3a880", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.17.1.linux-arm64", - "sha256": "de05dccd47932eb9fd6e63781ab29d2b0b2c834bbdd19b51d7ea452b1fe378d3", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-arm64" + "file": "buildx-v0.18.0.linux-arm64", + "sha256": "da9742321bb462547ebde69bf8420ac07b2a2c80fb57260f539bfc9f312becd6", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm64" }, "ppc64le": { - "file": "buildx-v0.17.1.linux-ppc64le", - "sha256": "29b4f2de5a1e6ecb4096868111d693a8ba4aaf144d535242ce19fc4154f94a4e", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-ppc64le" + "file": "buildx-v0.18.0.linux-ppc64le", + "sha256": "ef63b95d022c53b41b2404aef7ca77c2e775f2be63566d2af00260ed13c51984", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.17.1.linux-riscv64", - "sha256": "e67d26acb10c4529b9b5ca4e20781865d63e538228c566af6d1e91da65cdb992", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-riscv64" + "file": "buildx-v0.18.0.linux-riscv64", + "sha256": "49dd68603c992b6755fc7c8a7762fbbe689f2aca97a55a513c978e02582f9a81", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.17.1.linux-s390x", - "sha256": "9a3a4376025d1c2771ac69aceff0bcb19a2594413e318a34455af037ce903f06", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.linux-s390x" + "file": "buildx-v0.18.0.linux-s390x", + "sha256": "f4a69adac9a2734ab191c29529f54012b289884b626d75baa3cf0471b0241f58", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.17.1.windows-amd64.exe", - "sha256": "8751c926b953edf6dd9c7db0b01e567033c407e85bb5f21d559199e2553a07cc", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-amd64.exe" + "file": "buildx-v0.18.0.windows-amd64.exe", + "sha256": "85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.17.1.windows-arm64.exe", - "sha256": "e9c302fb36d16ba8df5488f536a66966f807c4342efc59f5b669d31cd0370d67", - "url": "https://github.com/docker/buildx/releases/download/v0.17.1/buildx-v0.17.1.windows-arm64.exe" + "file": "buildx-v0.18.0.windows-arm64.exe", + "sha256": "d4146509a4c3ba414bff214a69f54c6faa755f3f47f1b581bbbbbacef6453a3f", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-arm64.exe" } }, - "version": "0.17.1" + "version": "0.18.0" }, "compose": { "arches": { From bef014490d74e648d3b6a0ff61919022c150a12b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 5 Nov 2024 09:02:10 -0800 Subject: [PATCH 416/667] Update 27 to compose 2.30.2 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 03addd490..91e399810 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.30.1 +ENV DOCKER_COMPOSE_VERSION 2.30.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-x86_64'; \ - sha256='bd976a501e471c14b320876686f1628db3c37ab223405d2a815022fc711e704e'; \ + url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-x86_64'; \ + sha256='64b798329464b7553bdf4706c5fb1a97dc9504b360f29d30479ac126017d3944'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-armv6'; \ - sha256='2c70bd6e01ceb550d81a1bb0981f8f24c58ec301ac0c1432db132e07842544fe'; \ + url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-armv6'; \ + sha256='a22f58dfc94fd1f8e86dee81e1378ae648c14a3bf0604d3a5434b53650619140'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-armv7'; \ - sha256='205f947e00fdfb2d4787fb5d38267d56e68bbf07757d8e30d7b1c9c1086c8477'; \ + url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-armv7'; \ + sha256='9fb8f299c55451c08ea04dd7770fd698f45e31ab12df99dd582f0fa0984f5364'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-aarch64'; \ - sha256='f869d0900f8744b3f295c5bf8ed68488110598891d3db1d93db7203db9fa535b'; \ + url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-aarch64'; \ + sha256='2c7c902a845288c5733f6d13910ef65e17283f25b3519dee704d6d74de2ec78b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-ppc64le'; \ - sha256='93e47b53fcaaa366555cfa92ff49c77c16e2d76ccf26f816db24683b6bdb36ac'; \ + url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-ppc64le'; \ + sha256='a3778d98118d408620eeed110a9bf85c77460601384899566293e8e90e21e206'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-riscv64'; \ - sha256='0431d523628c26e74308be72205d13866bc978970b2e98efc60f5ecf23089ed2'; \ + url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-riscv64'; \ + sha256='9d3215288f9e9626c4e720576582fedbb4dfa3c728e53e3bb7151eca0251fa5c'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-s390x'; \ - sha256='afed38f2f18219d3fe79f2f0bc11d21458195c7f19d812c3ecd1a2608094fa84'; \ + url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-s390x'; \ + sha256='797f3d346f53ffc751eb0bebc9c8f610503bdea84ec993d00ee15e77ed2f0eb9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 34ad5e374..77037eb27 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.30.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bf29dcf1b35cf226ca0fe337d0de903060ec50855eea5c0eb54739e3c3c3fa5a +ENV DOCKER_COMPOSE_VERSION 2.30.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c9d3cfb7b2781fae4d2f5bc3cab2cf38ce6e2b48e4d98305c60535f9e3c879d3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index f98b64114..cf7a22da2 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.30.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bf29dcf1b35cf226ca0fe337d0de903060ec50855eea5c0eb54739e3c3c3fa5a +ENV DOCKER_COMPOSE_VERSION 2.30.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c9d3cfb7b2781fae4d2f5bc3cab2cf38ce6e2b48e4d98305c60535f9e3c879d3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b41595b9a..36e931585 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "bd976a501e471c14b320876686f1628db3c37ab223405d2a815022fc711e704e", - "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-x86_64" + "sha256": "64b798329464b7553bdf4706c5fb1a97dc9504b360f29d30479ac126017d3944", + "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "2c70bd6e01ceb550d81a1bb0981f8f24c58ec301ac0c1432db132e07842544fe", - "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-armv6" + "sha256": "a22f58dfc94fd1f8e86dee81e1378ae648c14a3bf0604d3a5434b53650619140", + "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "205f947e00fdfb2d4787fb5d38267d56e68bbf07757d8e30d7b1c9c1086c8477", - "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-armv7" + "sha256": "9fb8f299c55451c08ea04dd7770fd698f45e31ab12df99dd582f0fa0984f5364", + "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "f869d0900f8744b3f295c5bf8ed68488110598891d3db1d93db7203db9fa535b", - "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-aarch64" + "sha256": "2c7c902a845288c5733f6d13910ef65e17283f25b3519dee704d6d74de2ec78b", + "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "37df4a6d3045ee68b47e1701cbe1b2f6c8c82d9c0dddb615b8da62f3223fd135", - "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-darwin-x86_64" + "sha256": "aa507860f9ccc0a2e112fd6c1d0537765bd834c9655d0fc4115501857ba6e61d", + "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "589dcbe897e74b1ef4f6eef20e0750efff2bbca7a7009daf37d760a3f453f72b", - "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-darwin-aarch64" + "sha256": "2bfe3653d4469c27dc4cd9723a2bb5b2b80913456c90559ac070cd6563d147e4", + "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "93e47b53fcaaa366555cfa92ff49c77c16e2d76ccf26f816db24683b6bdb36ac", - "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-ppc64le" + "sha256": "a3778d98118d408620eeed110a9bf85c77460601384899566293e8e90e21e206", + "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "0431d523628c26e74308be72205d13866bc978970b2e98efc60f5ecf23089ed2", - "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-riscv64" + "sha256": "9d3215288f9e9626c4e720576582fedbb4dfa3c728e53e3bb7151eca0251fa5c", + "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "afed38f2f18219d3fe79f2f0bc11d21458195c7f19d812c3ecd1a2608094fa84", - "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-s390x" + "sha256": "797f3d346f53ffc751eb0bebc9c8f610503bdea84ec993d00ee15e77ed2f0eb9", + "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "bf29dcf1b35cf226ca0fe337d0de903060ec50855eea5c0eb54739e3c3c3fa5a", - "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-windows-x86_64.exe" + "sha256": "c9d3cfb7b2781fae4d2f5bc3cab2cf38ce6e2b48e4d98305c60535f9e3c879d3", + "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "85a61b020123b539ca9c41b21e76d348acc4a8ab3b0cea61ed144b8fa4a84240", - "url": "https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-windows-aarch64.exe" + "sha256": "87dcfc1dd4afb2e87ae8135fcb64f71125b70e6500b0cf7227f512d4650c3e6a", + "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.30.1" + "version": "2.30.2" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 9095b12e6b5eb72689fb2c15f76403ce35ce04f7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 7 Nov 2024 10:04:14 -0800 Subject: [PATCH 417/667] Update 27 to compose 2.30.3 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 91e399810..70713b4e6 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.30.2 +ENV DOCKER_COMPOSE_VERSION 2.30.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-x86_64'; \ - sha256='64b798329464b7553bdf4706c5fb1a97dc9504b360f29d30479ac126017d3944'; \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-x86_64'; \ + sha256='fbb4853d3f2148b0f2f0916f8971c9e500784e4e4949324934fc0b7dc2ed5016'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-armv6'; \ - sha256='a22f58dfc94fd1f8e86dee81e1378ae648c14a3bf0604d3a5434b53650619140'; \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv6'; \ + sha256='7116c73bd22504ff61e5e25f3ea6638a7b2a5d126764fccdec4fd7623cf17963'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-armv7'; \ - sha256='9fb8f299c55451c08ea04dd7770fd698f45e31ab12df99dd582f0fa0984f5364'; \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv7'; \ + sha256='944402b85b5eb8492ebbe2e4dcbf962adcaaa16b0ed66b51abaf2ac3e3809b1b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-aarch64'; \ - sha256='2c7c902a845288c5733f6d13910ef65e17283f25b3519dee704d6d74de2ec78b'; \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-aarch64'; \ + sha256='8fed7b79b8bd1cb0624142f7d723c3cc67ba747c77ed69abbdefdc77a6d416d1'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-ppc64le'; \ - sha256='a3778d98118d408620eeed110a9bf85c77460601384899566293e8e90e21e206'; \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-ppc64le'; \ + sha256='9a5d9fd85e852a9c3c9137ea8ea80d66f0fe349d34b3e329255d98cd960c331e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-riscv64'; \ - sha256='9d3215288f9e9626c4e720576582fedbb4dfa3c728e53e3bb7151eca0251fa5c'; \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-riscv64'; \ + sha256='eda617db72d24fe79be98e2273e1fb433943a18479cedc86601963f75666304f'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-s390x'; \ - sha256='797f3d346f53ffc751eb0bebc9c8f610503bdea84ec993d00ee15e77ed2f0eb9'; \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-s390x'; \ + sha256='9476a64e9605df956e3e33b09acfdaed2d4a2c71da5b4a09899a9b7d428263a0'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 77037eb27..f81275edd 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.30.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c9d3cfb7b2781fae4d2f5bc3cab2cf38ce6e2b48e4d98305c60535f9e3c879d3 +ENV DOCKER_COMPOSE_VERSION 2.30.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index cf7a22da2..d7f861d03 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.30.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c9d3cfb7b2781fae4d2f5bc3cab2cf38ce6e2b48e4d98305c60535f9e3c879d3 +ENV DOCKER_COMPOSE_VERSION 2.30.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 36e931585..8b5e27d0d 100644 --- a/versions.json +++ b/versions.json @@ -73,61 +73,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "64b798329464b7553bdf4706c5fb1a97dc9504b360f29d30479ac126017d3944", - "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-x86_64" + "sha256": "fbb4853d3f2148b0f2f0916f8971c9e500784e4e4949324934fc0b7dc2ed5016", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a22f58dfc94fd1f8e86dee81e1378ae648c14a3bf0604d3a5434b53650619140", - "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-armv6" + "sha256": "7116c73bd22504ff61e5e25f3ea6638a7b2a5d126764fccdec4fd7623cf17963", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9fb8f299c55451c08ea04dd7770fd698f45e31ab12df99dd582f0fa0984f5364", - "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-armv7" + "sha256": "944402b85b5eb8492ebbe2e4dcbf962adcaaa16b0ed66b51abaf2ac3e3809b1b", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "2c7c902a845288c5733f6d13910ef65e17283f25b3519dee704d6d74de2ec78b", - "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-aarch64" + "sha256": "8fed7b79b8bd1cb0624142f7d723c3cc67ba747c77ed69abbdefdc77a6d416d1", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "aa507860f9ccc0a2e112fd6c1d0537765bd834c9655d0fc4115501857ba6e61d", - "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-darwin-x86_64" + "sha256": "57af23f5d802450bb26804d697c6c491e59302a2aece59a883f403747c549df8", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "2bfe3653d4469c27dc4cd9723a2bb5b2b80913456c90559ac070cd6563d147e4", - "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-darwin-aarch64" + "sha256": "502181d56f2b9d6ed581452f3d71b9205e5618d671e9a2560663c21a8b21f154", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "a3778d98118d408620eeed110a9bf85c77460601384899566293e8e90e21e206", - "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-ppc64le" + "sha256": "9a5d9fd85e852a9c3c9137ea8ea80d66f0fe349d34b3e329255d98cd960c331e", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9d3215288f9e9626c4e720576582fedbb4dfa3c728e53e3bb7151eca0251fa5c", - "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-riscv64" + "sha256": "eda617db72d24fe79be98e2273e1fb433943a18479cedc86601963f75666304f", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "797f3d346f53ffc751eb0bebc9c8f610503bdea84ec993d00ee15e77ed2f0eb9", - "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-s390x" + "sha256": "9476a64e9605df956e3e33b09acfdaed2d4a2c71da5b4a09899a9b7d428263a0", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "c9d3cfb7b2781fae4d2f5bc3cab2cf38ce6e2b48e4d98305c60535f9e3c879d3", - "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-windows-x86_64.exe" + "sha256": "30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "87dcfc1dd4afb2e87ae8135fcb64f71125b70e6500b0cf7227f512d4650c3e6a", - "url": "https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-windows-aarch64.exe" + "sha256": "a94f899cd90b9221929edeb182b467500d81f75bd8a6b84b12b939a076e1a4df", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.30.2" + "version": "2.30.3" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From ad57caf9179715e19c7e5058940f8936807fffe4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 14 Nov 2024 16:04:24 -0800 Subject: [PATCH 418/667] Update 27-rc to 27.4.0-rc.1, buildx 0.18.0, compose 2.30.3 --- 27-rc/cli/Dockerfile | 167 +++++++++++++ 27-rc/cli/docker-entrypoint.sh | 61 +++++ 27-rc/cli/modprobe.sh | 20 ++ 27-rc/dind-rootless/Dockerfile | 55 ++++ 27-rc/dind/Dockerfile | 108 ++++++++ 27-rc/dind/dockerd-entrypoint.sh | 234 ++++++++++++++++++ .../windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ versions.json | 141 ++++++++++- 9 files changed, 967 insertions(+), 1 deletion(-) create mode 100644 27-rc/cli/Dockerfile create mode 100755 27-rc/cli/docker-entrypoint.sh create mode 100755 27-rc/cli/modprobe.sh create mode 100644 27-rc/dind-rootless/Dockerfile create mode 100644 27-rc/dind/Dockerfile create mode 100755 27-rc/dind/dockerd-entrypoint.sh create mode 100644 27-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 27-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile new file mode 100644 index 000000000..a3c9f66e0 --- /dev/null +++ b/27-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.20 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 27.4.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.18.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-amd64'; \ + sha256='4fe2eb90ac22b27fa03734899fcf814aa1e214a4952b9b30b20d551baf1d9a5c'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v6'; \ + sha256='f438c1845f515b7deda0d7f325752f5652f2206a34ab2fff611f8a8717fb8907'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v7'; \ + sha256='606e449ac112615e0bffe6c433e59e84145e6963119ea397227381b86da3a880'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm64'; \ + sha256='da9742321bb462547ebde69bf8420ac07b2a2c80fb57260f539bfc9f312becd6'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-ppc64le'; \ + sha256='ef63b95d022c53b41b2404aef7ca77c2e775f2be63566d2af00260ed13c51984'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-riscv64'; \ + sha256='49dd68603c992b6755fc7c8a7762fbbe689f2aca97a55a513c978e02582f9a81'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-s390x'; \ + sha256='f4a69adac9a2734ab191c29529f54012b289884b626d75baa3cf0471b0241f58'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.30.3 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-x86_64'; \ + sha256='fbb4853d3f2148b0f2f0916f8971c9e500784e4e4949324934fc0b7dc2ed5016'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv6'; \ + sha256='7116c73bd22504ff61e5e25f3ea6638a7b2a5d126764fccdec4fd7623cf17963'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv7'; \ + sha256='944402b85b5eb8492ebbe2e4dcbf962adcaaa16b0ed66b51abaf2ac3e3809b1b'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-aarch64'; \ + sha256='8fed7b79b8bd1cb0624142f7d723c3cc67ba747c77ed69abbdefdc77a6d416d1'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-ppc64le'; \ + sha256='9a5d9fd85e852a9c3c9137ea8ea80d66f0fe349d34b3e329255d98cd960c331e'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-riscv64'; \ + sha256='eda617db72d24fe79be98e2273e1fb433943a18479cedc86601963f75666304f'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-s390x'; \ + sha256='9476a64e9605df956e3e33b09acfdaed2d4a2c71da5b4a09899a9b7d428263a0'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/27-rc/cli/docker-entrypoint.sh b/27-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/27-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/27-rc/cli/modprobe.sh b/27-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/27-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..0b614bf16 --- /dev/null +++ b/27-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile new file mode 100644 index 000000000..128445925 --- /dev/null +++ b/27-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 + b="/sbin/${f/tables/tables-legacy}"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:27-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/27-rc/dind/dockerd-entrypoint.sh b/27-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..6c06bb811 --- /dev/null +++ b/27-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,234 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..0534a06b2 --- /dev/null +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.4.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.18.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.30.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..13af56d0d --- /dev/null +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.4.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.18.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.30.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 8b5e27d0d..05515cc1c 100644 --- a/versions.json +++ b/versions.json @@ -139,5 +139,144 @@ ], "version": "27.3.1" }, - "27-rc": null + "27-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.18.0.linux-amd64", + "sha256": "4fe2eb90ac22b27fa03734899fcf814aa1e214a4952b9b30b20d551baf1d9a5c", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.18.0.linux-arm-v6", + "sha256": "f438c1845f515b7deda0d7f325752f5652f2206a34ab2fff611f8a8717fb8907", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.18.0.linux-arm-v7", + "sha256": "606e449ac112615e0bffe6c433e59e84145e6963119ea397227381b86da3a880", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.18.0.linux-arm64", + "sha256": "da9742321bb462547ebde69bf8420ac07b2a2c80fb57260f539bfc9f312becd6", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm64" + }, + "ppc64le": { + "file": "buildx-v0.18.0.linux-ppc64le", + "sha256": "ef63b95d022c53b41b2404aef7ca77c2e775f2be63566d2af00260ed13c51984", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.18.0.linux-riscv64", + "sha256": "49dd68603c992b6755fc7c8a7762fbbe689f2aca97a55a513c978e02582f9a81", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.18.0.linux-s390x", + "sha256": "f4a69adac9a2734ab191c29529f54012b289884b626d75baa3cf0471b0241f58", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.18.0.windows-amd64.exe", + "sha256": "85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.18.0.windows-arm64.exe", + "sha256": "d4146509a4c3ba414bff214a69f54c6faa755f3f47f1b581bbbbbacef6453a3f", + "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-arm64.exe" + } + }, + "version": "0.18.0" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "fbb4853d3f2148b0f2f0916f8971c9e500784e4e4949324934fc0b7dc2ed5016", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "7116c73bd22504ff61e5e25f3ea6638a7b2a5d126764fccdec4fd7623cf17963", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "944402b85b5eb8492ebbe2e4dcbf962adcaaa16b0ed66b51abaf2ac3e3809b1b", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "8fed7b79b8bd1cb0624142f7d723c3cc67ba747c77ed69abbdefdc77a6d416d1", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "57af23f5d802450bb26804d697c6c491e59302a2aece59a883f403747c549df8", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "502181d56f2b9d6ed581452f3d71b9205e5618d671e9a2560663c21a8b21f154", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "9a5d9fd85e852a9c3c9137ea8ea80d66f0fe349d34b3e329255d98cd960c331e", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "eda617db72d24fe79be98e2273e1fb433943a18479cedc86601963f75666304f", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "9476a64e9605df956e3e33b09acfdaed2d4a2c71da5b4a09899a9b7d428263a0", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "a94f899cd90b9221929edeb182b467500d81f75bd8a6b84b12b939a076e1a4df", + "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.30.3" + }, + "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "27.4.0-rc.1" + } } From 8dbed50d0e0d056458139f6e5eaa5629b589a4ef Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 19 Nov 2024 10:04:23 -0800 Subject: [PATCH 419/667] Update 27-rc to 27.4.0-rc.2 --- 27-rc/cli/Dockerfile | 10 +++++----- 27-rc/dind-rootless/Dockerfile | 4 ++-- 27-rc/dind/Dockerfile | 8 ++++---- 27-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index a3c9f66e0..5ee555b78 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.4.0-rc.1 +ENV DOCKER_VERSION 27.4.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile index 0b614bf16..1968f21e7 100644 --- a/27-rc/dind-rootless/Dockerfile +++ b/27-rc/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/test/x86_64/docker-rootless-extras-27.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile index 128445925..040d1ca1e 100644 --- a/27-rc/dind/Dockerfile +++ b/27-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index 0534a06b2..dd26c7588 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/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 27.4.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.1.zip +ENV DOCKER_VERSION 27.4.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.2.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/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index 13af56d0d..02b658bcb 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/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 27.4.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.1.zip +ENV DOCKER_VERSION 27.4.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.2.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/versions.json b/versions.json index 05515cc1c..b5239a747 100644 --- a/versions.json +++ b/versions.json @@ -142,21 +142,21 @@ "27-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.2.zip" } }, "buildx": { @@ -277,6 +277,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.4.0-rc.1" + "version": "27.4.0-rc.2" } } From fbbec7542dcfd052a3dd96b7085b92ee6ee064de Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 21 Nov 2024 10:48:15 -0800 Subject: [PATCH 420/667] Update README See https://github.com/docker-library/docs/pull/2503 --- README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/README.md b/README.md index 88f555fba..bcd2f83db 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,4 @@ For more information about the full official images change lifecycle, see [the " For outstanding `docker` image PRs, check [PRs with the "library/docker" label on the official-images repository](https://github.com/docker-library/official-images/labels/library%2Fdocker). For the current "source of truth" for [`docker`](https://hub.docker.com/_/docker/), see [the `library/docker` file in the official-images repository](https://github.com/docker-library/official-images/blob/master/library/docker). ---- - -- [![build status badge](https://img.shields.io/github/actions/workflow/status/docker-library/docker/ci.yml?branch=master&label=GitHub%20CI)](https://github.com/docker-library/docker/actions?query=workflow%3A%22GitHub+CI%22+branch%3Amaster) -- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/docker.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/docker/) - -| Build | Status | Badges | (per-arch) | -|:-:|:-:|:-:|:-:| -| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/docker/) | [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/docker/) | [![windows-amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/docker.svg?label=windows-amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/windows-amd64/job/docker/) | [![put-shared build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/put-shared/job/light/job/docker.svg?label=put-shared)](https://doi-janky.infosiftr.net/job/put-shared/job/light/job/docker/) | - From dc151fc1fc137f4262c129333fcd07789076a793 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Tue, 3 Dec 2024 11:21:07 -0800 Subject: [PATCH 421/667] Fix failing `versions.sh` that is causing the update job to fail Adjust jq regex to account for BSD artifacts ```console jq: error (at :39): failed to parse os-arch from filename: buildx-v0.19.1.freebsd-amd64 ``` --- versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.sh b/versions.sh index 04cb48f57..645d51e74 100755 --- a/versions.sh +++ b/versions.sh @@ -103,7 +103,7 @@ for buildxVersion in $buildxVersions; do | select(.file | test("[.]json$") | not) | { ( .file - | capture("[.](?linux|windows|darwin)-(?[^.]+)(?[.]exe)?$") + | capture("[.](?linux|windows|darwin|freebsd|openbsd)-(?[^.]+)(?[.]exe)?$") // error("failed to parse os-arch from filename: " + .) | if .os == "linux" then "" else .os + "-" end + ({ From f6a3252fdd888f9e8171611f27593b09be239c0c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 3 Dec 2024 14:20:55 -0800 Subject: [PATCH 422/667] Update 27 to buildx 0.19.1, compose 2.31.0 --- 27/cli/Dockerfile | 60 ++++----- 27/windows/windowsservercore-1809/Dockerfile | 12 +- .../windowsservercore-ltsc2022/Dockerfile | 12 +- versions.json | 122 ++++++++++-------- 4 files changed, 113 insertions(+), 93 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 70713b4e6..0bcc9c49f 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.18.0 +ENV DOCKER_BUILDX_VERSION 0.19.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-amd64'; \ - sha256='4fe2eb90ac22b27fa03734899fcf814aa1e214a4952b9b30b20d551baf1d9a5c'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-amd64'; \ + sha256='153eace3d30c9efe9a7b94ea06c9d15ace59c8e6268d3481b8c175bd3df020f9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v6'; \ - sha256='f438c1845f515b7deda0d7f325752f5652f2206a34ab2fff611f8a8717fb8907'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v6'; \ + sha256='6f7e15248535bcae3730444bbf6164d076b9df7491b89040153f12d9e93a9f6b'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v7'; \ - sha256='606e449ac112615e0bffe6c433e59e84145e6963119ea397227381b86da3a880'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v7'; \ + sha256='b2bb531e4f217c94951173a9e403002f6b18868227f09715c295a63f837cf5e4'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm64'; \ - sha256='da9742321bb462547ebde69bf8420ac07b2a2c80fb57260f539bfc9f312becd6'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm64'; \ + sha256='9ecffda0a356957827de6b4ed86b151b420e84f81b2a58e2e2735506336ab891'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-ppc64le'; \ - sha256='ef63b95d022c53b41b2404aef7ca77c2e775f2be63566d2af00260ed13c51984'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-ppc64le'; \ + sha256='10ab6f3effac50e4150a3288013ad34e3cf4a0b307c7ffbf48dda9a5813e1bda'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-riscv64'; \ - sha256='49dd68603c992b6755fc7c8a7762fbbe689f2aca97a55a513c978e02582f9a81'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-riscv64'; \ + sha256='c89af9a424a109abd52205544377a9eac6027bb91c2fbe91d02cf91a6b53f7e8'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-s390x'; \ - sha256='f4a69adac9a2734ab191c29529f54012b289884b626d75baa3cf0471b0241f58'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-s390x'; \ + sha256='cfaf3883fe66787297c8df69e25f95246a74d630b5e2b6627cc563246f94b4f9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.30.3 +ENV DOCKER_COMPOSE_VERSION 2.31.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-x86_64'; \ - sha256='fbb4853d3f2148b0f2f0916f8971c9e500784e4e4949324934fc0b7dc2ed5016'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-x86_64'; \ + sha256='8b5d2cb358427e654ada217cfdfedc00c4273f7a8ee07f27003a18d15461b6cd'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv6'; \ - sha256='7116c73bd22504ff61e5e25f3ea6638a7b2a5d126764fccdec4fd7623cf17963'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv6'; \ + sha256='5812e2fe5e8fdbaa984679ad5809779a0a0f054a423a63f6d15167b5d643db43'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv7'; \ - sha256='944402b85b5eb8492ebbe2e4dcbf962adcaaa16b0ed66b51abaf2ac3e3809b1b'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv7'; \ + sha256='f8271667b0b0337cdd11a0f2920089f09b06bb4e5e3988e66ab23b5d18c3fa18'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-aarch64'; \ - sha256='8fed7b79b8bd1cb0624142f7d723c3cc67ba747c77ed69abbdefdc77a6d416d1'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-aarch64'; \ + sha256='a1f85584584d0c3c489f31f015c97eb543f1f0949fdc5ce3ded88c05a5188729'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-ppc64le'; \ - sha256='9a5d9fd85e852a9c3c9137ea8ea80d66f0fe349d34b3e329255d98cd960c331e'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-ppc64le'; \ + sha256='0f6149bb38f1722dea511fc80228d9bc7c3504cedaf662e09033d3aa89c70d93'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-riscv64'; \ - sha256='eda617db72d24fe79be98e2273e1fb433943a18479cedc86601963f75666304f'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-riscv64'; \ + sha256='f3f9a94dc4bb8773bdcd70680a177171e8aeb15b98b979fe51b447a5c97c52d1'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-s390x'; \ - sha256='9476a64e9605df956e3e33b09acfdaed2d4a2c71da5b4a09899a9b7d428263a0'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-s390x'; \ + sha256='6635a146193c797ed11ba3a6e9d7b1da5df0f1215ccd3c52f712001e58413f20'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index f81275edd..085b1f6a9 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.18.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca +ENV DOCKER_BUILDX_VERSION 0.19.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.30.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b +ENV DOCKER_COMPOSE_VERSION 2.31.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index d7f861d03..c11f9f4ff 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.18.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca +ENV DOCKER_BUILDX_VERSION 0.19.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.30.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b +ENV DOCKER_COMPOSE_VERSION 2.31.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b5239a747..ce3756920 100644 --- a/versions.json +++ b/versions.json @@ -22,112 +22,132 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.18.0.linux-amd64", - "sha256": "4fe2eb90ac22b27fa03734899fcf814aa1e214a4952b9b30b20d551baf1d9a5c", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-amd64" + "file": "buildx-v0.19.1.linux-amd64", + "sha256": "153eace3d30c9efe9a7b94ea06c9d15ace59c8e6268d3481b8c175bd3df020f9", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.18.0.linux-arm-v6", - "sha256": "f438c1845f515b7deda0d7f325752f5652f2206a34ab2fff611f8a8717fb8907", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v6" + "file": "buildx-v0.19.1.linux-arm-v6", + "sha256": "6f7e15248535bcae3730444bbf6164d076b9df7491b89040153f12d9e93a9f6b", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.18.0.linux-arm-v7", - "sha256": "606e449ac112615e0bffe6c433e59e84145e6963119ea397227381b86da3a880", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v7" + "file": "buildx-v0.19.1.linux-arm-v7", + "sha256": "b2bb531e4f217c94951173a9e403002f6b18868227f09715c295a63f837cf5e4", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.18.0.linux-arm64", - "sha256": "da9742321bb462547ebde69bf8420ac07b2a2c80fb57260f539bfc9f312becd6", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm64" + "file": "buildx-v0.19.1.linux-arm64", + "sha256": "9ecffda0a356957827de6b4ed86b151b420e84f81b2a58e2e2735506336ab891", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.19.1.freebsd-amd64", + "sha256": "464ac326186dae232684b7ad623163a801fac2f0f8aa9a378460b8446cc1b3ec", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.19.1.freebsd-arm64", + "sha256": "d05675b74fd33d01963ae043027b84993e4aa2db389fec280cf1796d2179d420", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.freebsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.19.1.openbsd-amd64", + "sha256": "8d9d29fddbf90caf2dba5a138d79b346bf7602a257995fcdb4786c732a0ada96", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.19.1.openbsd-arm64", + "sha256": "f19dd0a8fbf5b10ab5ff04fd363fb6fa75652427257b85fa91d9cc209ea6ed79", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.18.0.linux-ppc64le", - "sha256": "ef63b95d022c53b41b2404aef7ca77c2e775f2be63566d2af00260ed13c51984", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-ppc64le" + "file": "buildx-v0.19.1.linux-ppc64le", + "sha256": "10ab6f3effac50e4150a3288013ad34e3cf4a0b307c7ffbf48dda9a5813e1bda", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.18.0.linux-riscv64", - "sha256": "49dd68603c992b6755fc7c8a7762fbbe689f2aca97a55a513c978e02582f9a81", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-riscv64" + "file": "buildx-v0.19.1.linux-riscv64", + "sha256": "c89af9a424a109abd52205544377a9eac6027bb91c2fbe91d02cf91a6b53f7e8", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.18.0.linux-s390x", - "sha256": "f4a69adac9a2734ab191c29529f54012b289884b626d75baa3cf0471b0241f58", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-s390x" + "file": "buildx-v0.19.1.linux-s390x", + "sha256": "cfaf3883fe66787297c8df69e25f95246a74d630b5e2b6627cc563246f94b4f9", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.18.0.windows-amd64.exe", - "sha256": "85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe" + "file": "buildx-v0.19.1.windows-amd64.exe", + "sha256": "62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.18.0.windows-arm64.exe", - "sha256": "d4146509a4c3ba414bff214a69f54c6faa755f3f47f1b581bbbbbacef6453a3f", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-arm64.exe" + "file": "buildx-v0.19.1.windows-arm64.exe", + "sha256": "17e5d2ba6e49b3a3ffe993eb9d449db65dd6e88af0284b51fdb4a9a7e4132deb", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-arm64.exe" } }, - "version": "0.18.0" + "version": "0.19.1" }, "compose": { "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "fbb4853d3f2148b0f2f0916f8971c9e500784e4e4949324934fc0b7dc2ed5016", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-x86_64" + "sha256": "8b5d2cb358427e654ada217cfdfedc00c4273f7a8ee07f27003a18d15461b6cd", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "7116c73bd22504ff61e5e25f3ea6638a7b2a5d126764fccdec4fd7623cf17963", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv6" + "sha256": "5812e2fe5e8fdbaa984679ad5809779a0a0f054a423a63f6d15167b5d643db43", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "944402b85b5eb8492ebbe2e4dcbf962adcaaa16b0ed66b51abaf2ac3e3809b1b", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv7" + "sha256": "f8271667b0b0337cdd11a0f2920089f09b06bb4e5e3988e66ab23b5d18c3fa18", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "8fed7b79b8bd1cb0624142f7d723c3cc67ba747c77ed69abbdefdc77a6d416d1", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-aarch64" + "sha256": "a1f85584584d0c3c489f31f015c97eb543f1f0949fdc5ce3ded88c05a5188729", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "57af23f5d802450bb26804d697c6c491e59302a2aece59a883f403747c549df8", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-darwin-x86_64" + "sha256": "1016a4b0bc5554c12152a986c06725db491e0e91f94f7a566d425f1225b399e7", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "502181d56f2b9d6ed581452f3d71b9205e5618d671e9a2560663c21a8b21f154", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-darwin-aarch64" + "sha256": "53b19ae8edb06e86c06bad9723b5b5c791370a9498fede6f89537d915eced1d5", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "9a5d9fd85e852a9c3c9137ea8ea80d66f0fe349d34b3e329255d98cd960c331e", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-ppc64le" + "sha256": "0f6149bb38f1722dea511fc80228d9bc7c3504cedaf662e09033d3aa89c70d93", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "eda617db72d24fe79be98e2273e1fb433943a18479cedc86601963f75666304f", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-riscv64" + "sha256": "f3f9a94dc4bb8773bdcd70680a177171e8aeb15b98b979fe51b447a5c97c52d1", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "9476a64e9605df956e3e33b09acfdaed2d4a2c71da5b4a09899a9b7d428263a0", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-s390x" + "sha256": "6635a146193c797ed11ba3a6e9d7b1da5df0f1215ccd3c52f712001e58413f20", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe" + "sha256": "93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "a94f899cd90b9221929edeb182b467500d81f75bd8a6b84b12b939a076e1a4df", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-aarch64.exe" + "sha256": "199abed1ee66d796170999bdd6cb36ad611773da6fa14147d5de4b55a62aa55f", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.30.3" + "version": "2.31.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 4177dedd5eef9ccb8b757d4160320244b172c614 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 3 Dec 2024 14:22:58 -0800 Subject: [PATCH 423/667] Update 27-rc to 27.4.0-rc.3, buildx 0.19.1, compose 2.31.0 --- 27-rc/cli/Dockerfile | 70 ++++----- 27-rc/dind-rootless/Dockerfile | 4 +- 27-rc/dind/Dockerfile | 8 +- .../windows/windowsservercore-1809/Dockerfile | 16 +- .../windowsservercore-ltsc2022/Dockerfile | 16 +- versions.json | 138 ++++++++++-------- 6 files changed, 136 insertions(+), 116 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index 5ee555b78..b0c55285d 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.4.0-rc.2 +ENV DOCKER_VERSION 27.4.0-rc.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.18.0 +ENV DOCKER_BUILDX_VERSION 0.19.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-amd64'; \ - sha256='4fe2eb90ac22b27fa03734899fcf814aa1e214a4952b9b30b20d551baf1d9a5c'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-amd64'; \ + sha256='153eace3d30c9efe9a7b94ea06c9d15ace59c8e6268d3481b8c175bd3df020f9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v6'; \ - sha256='f438c1845f515b7deda0d7f325752f5652f2206a34ab2fff611f8a8717fb8907'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v6'; \ + sha256='6f7e15248535bcae3730444bbf6164d076b9df7491b89040153f12d9e93a9f6b'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v7'; \ - sha256='606e449ac112615e0bffe6c433e59e84145e6963119ea397227381b86da3a880'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v7'; \ + sha256='b2bb531e4f217c94951173a9e403002f6b18868227f09715c295a63f837cf5e4'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm64'; \ - sha256='da9742321bb462547ebde69bf8420ac07b2a2c80fb57260f539bfc9f312becd6'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm64'; \ + sha256='9ecffda0a356957827de6b4ed86b151b420e84f81b2a58e2e2735506336ab891'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-ppc64le'; \ - sha256='ef63b95d022c53b41b2404aef7ca77c2e775f2be63566d2af00260ed13c51984'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-ppc64le'; \ + sha256='10ab6f3effac50e4150a3288013ad34e3cf4a0b307c7ffbf48dda9a5813e1bda'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-riscv64'; \ - sha256='49dd68603c992b6755fc7c8a7762fbbe689f2aca97a55a513c978e02582f9a81'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-riscv64'; \ + sha256='c89af9a424a109abd52205544377a9eac6027bb91c2fbe91d02cf91a6b53f7e8'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-s390x'; \ - sha256='f4a69adac9a2734ab191c29529f54012b289884b626d75baa3cf0471b0241f58'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-s390x'; \ + sha256='cfaf3883fe66787297c8df69e25f95246a74d630b5e2b6627cc563246f94b4f9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.30.3 +ENV DOCKER_COMPOSE_VERSION 2.31.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-x86_64'; \ - sha256='fbb4853d3f2148b0f2f0916f8971c9e500784e4e4949324934fc0b7dc2ed5016'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-x86_64'; \ + sha256='8b5d2cb358427e654ada217cfdfedc00c4273f7a8ee07f27003a18d15461b6cd'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv6'; \ - sha256='7116c73bd22504ff61e5e25f3ea6638a7b2a5d126764fccdec4fd7623cf17963'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv6'; \ + sha256='5812e2fe5e8fdbaa984679ad5809779a0a0f054a423a63f6d15167b5d643db43'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv7'; \ - sha256='944402b85b5eb8492ebbe2e4dcbf962adcaaa16b0ed66b51abaf2ac3e3809b1b'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv7'; \ + sha256='f8271667b0b0337cdd11a0f2920089f09b06bb4e5e3988e66ab23b5d18c3fa18'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-aarch64'; \ - sha256='8fed7b79b8bd1cb0624142f7d723c3cc67ba747c77ed69abbdefdc77a6d416d1'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-aarch64'; \ + sha256='a1f85584584d0c3c489f31f015c97eb543f1f0949fdc5ce3ded88c05a5188729'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-ppc64le'; \ - sha256='9a5d9fd85e852a9c3c9137ea8ea80d66f0fe349d34b3e329255d98cd960c331e'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-ppc64le'; \ + sha256='0f6149bb38f1722dea511fc80228d9bc7c3504cedaf662e09033d3aa89c70d93'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-riscv64'; \ - sha256='eda617db72d24fe79be98e2273e1fb433943a18479cedc86601963f75666304f'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-riscv64'; \ + sha256='f3f9a94dc4bb8773bdcd70680a177171e8aeb15b98b979fe51b447a5c97c52d1'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-s390x'; \ - sha256='9476a64e9605df956e3e33b09acfdaed2d4a2c71da5b4a09899a9b7d428263a0'; \ + url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-s390x'; \ + sha256='6635a146193c797ed11ba3a6e9d7b1da5df0f1215ccd3c52f712001e58413f20'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile index 1968f21e7..140784e74 100644 --- a/27-rc/dind-rootless/Dockerfile +++ b/27-rc/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/test/x86_64/docker-rootless-extras-27.4.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile index 040d1ca1e..7d70bda4c 100644 --- a/27-rc/dind/Dockerfile +++ b/27-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index dd26c7588..0c484d2bb 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/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 27.4.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.2.zip +ENV DOCKER_VERSION 27.4.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.3.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) @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.18.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca +ENV DOCKER_BUILDX_VERSION 0.19.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.30.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b +ENV DOCKER_COMPOSE_VERSION 2.31.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index 02b658bcb..8d70c2843 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/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 27.4.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.2.zip +ENV DOCKER_VERSION 27.4.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.3.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) @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.18.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca +ENV DOCKER_BUILDX_VERSION 0.19.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.30.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b +ENV DOCKER_COMPOSE_VERSION 2.31.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ce3756920..832ff240c 100644 --- a/versions.json +++ b/versions.json @@ -162,132 +162,152 @@ "27-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.2.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.3.zip" } }, "buildx": { "arches": { "amd64": { - "file": "buildx-v0.18.0.linux-amd64", - "sha256": "4fe2eb90ac22b27fa03734899fcf814aa1e214a4952b9b30b20d551baf1d9a5c", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-amd64" + "file": "buildx-v0.19.1.linux-amd64", + "sha256": "153eace3d30c9efe9a7b94ea06c9d15ace59c8e6268d3481b8c175bd3df020f9", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.18.0.linux-arm-v6", - "sha256": "f438c1845f515b7deda0d7f325752f5652f2206a34ab2fff611f8a8717fb8907", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v6" + "file": "buildx-v0.19.1.linux-arm-v6", + "sha256": "6f7e15248535bcae3730444bbf6164d076b9df7491b89040153f12d9e93a9f6b", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.18.0.linux-arm-v7", - "sha256": "606e449ac112615e0bffe6c433e59e84145e6963119ea397227381b86da3a880", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm-v7" + "file": "buildx-v0.19.1.linux-arm-v7", + "sha256": "b2bb531e4f217c94951173a9e403002f6b18868227f09715c295a63f837cf5e4", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.18.0.linux-arm64", - "sha256": "da9742321bb462547ebde69bf8420ac07b2a2c80fb57260f539bfc9f312becd6", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm64" + "file": "buildx-v0.19.1.linux-arm64", + "sha256": "9ecffda0a356957827de6b4ed86b151b420e84f81b2a58e2e2735506336ab891", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.19.1.freebsd-amd64", + "sha256": "464ac326186dae232684b7ad623163a801fac2f0f8aa9a378460b8446cc1b3ec", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.19.1.freebsd-arm64", + "sha256": "d05675b74fd33d01963ae043027b84993e4aa2db389fec280cf1796d2179d420", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.freebsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.19.1.openbsd-amd64", + "sha256": "8d9d29fddbf90caf2dba5a138d79b346bf7602a257995fcdb4786c732a0ada96", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.19.1.openbsd-arm64", + "sha256": "f19dd0a8fbf5b10ab5ff04fd363fb6fa75652427257b85fa91d9cc209ea6ed79", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.18.0.linux-ppc64le", - "sha256": "ef63b95d022c53b41b2404aef7ca77c2e775f2be63566d2af00260ed13c51984", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-ppc64le" + "file": "buildx-v0.19.1.linux-ppc64le", + "sha256": "10ab6f3effac50e4150a3288013ad34e3cf4a0b307c7ffbf48dda9a5813e1bda", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.18.0.linux-riscv64", - "sha256": "49dd68603c992b6755fc7c8a7762fbbe689f2aca97a55a513c978e02582f9a81", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-riscv64" + "file": "buildx-v0.19.1.linux-riscv64", + "sha256": "c89af9a424a109abd52205544377a9eac6027bb91c2fbe91d02cf91a6b53f7e8", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.18.0.linux-s390x", - "sha256": "f4a69adac9a2734ab191c29529f54012b289884b626d75baa3cf0471b0241f58", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-s390x" + "file": "buildx-v0.19.1.linux-s390x", + "sha256": "cfaf3883fe66787297c8df69e25f95246a74d630b5e2b6627cc563246f94b4f9", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.18.0.windows-amd64.exe", - "sha256": "85f9218497427f8a1d4e09fa73b7133b555f8017cffc24c4ffc9640668b61dca", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-amd64.exe" + "file": "buildx-v0.19.1.windows-amd64.exe", + "sha256": "62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.18.0.windows-arm64.exe", - "sha256": "d4146509a4c3ba414bff214a69f54c6faa755f3f47f1b581bbbbbacef6453a3f", - "url": "https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.windows-arm64.exe" + "file": "buildx-v0.19.1.windows-arm64.exe", + "sha256": "17e5d2ba6e49b3a3ffe993eb9d449db65dd6e88af0284b51fdb4a9a7e4132deb", + "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-arm64.exe" } }, - "version": "0.18.0" + "version": "0.19.1" }, "compose": { "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "fbb4853d3f2148b0f2f0916f8971c9e500784e4e4949324934fc0b7dc2ed5016", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-x86_64" + "sha256": "8b5d2cb358427e654ada217cfdfedc00c4273f7a8ee07f27003a18d15461b6cd", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "7116c73bd22504ff61e5e25f3ea6638a7b2a5d126764fccdec4fd7623cf17963", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv6" + "sha256": "5812e2fe5e8fdbaa984679ad5809779a0a0f054a423a63f6d15167b5d643db43", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "944402b85b5eb8492ebbe2e4dcbf962adcaaa16b0ed66b51abaf2ac3e3809b1b", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-armv7" + "sha256": "f8271667b0b0337cdd11a0f2920089f09b06bb4e5e3988e66ab23b5d18c3fa18", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "8fed7b79b8bd1cb0624142f7d723c3cc67ba747c77ed69abbdefdc77a6d416d1", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-aarch64" + "sha256": "a1f85584584d0c3c489f31f015c97eb543f1f0949fdc5ce3ded88c05a5188729", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "57af23f5d802450bb26804d697c6c491e59302a2aece59a883f403747c549df8", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-darwin-x86_64" + "sha256": "1016a4b0bc5554c12152a986c06725db491e0e91f94f7a566d425f1225b399e7", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "502181d56f2b9d6ed581452f3d71b9205e5618d671e9a2560663c21a8b21f154", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-darwin-aarch64" + "sha256": "53b19ae8edb06e86c06bad9723b5b5c791370a9498fede6f89537d915eced1d5", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "9a5d9fd85e852a9c3c9137ea8ea80d66f0fe349d34b3e329255d98cd960c331e", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-ppc64le" + "sha256": "0f6149bb38f1722dea511fc80228d9bc7c3504cedaf662e09033d3aa89c70d93", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "eda617db72d24fe79be98e2273e1fb433943a18479cedc86601963f75666304f", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-riscv64" + "sha256": "f3f9a94dc4bb8773bdcd70680a177171e8aeb15b98b979fe51b447a5c97c52d1", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "9476a64e9605df956e3e33b09acfdaed2d4a2c71da5b4a09899a9b7d428263a0", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-linux-s390x" + "sha256": "6635a146193c797ed11ba3a6e9d7b1da5df0f1215ccd3c52f712001e58413f20", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "30be0d2d5df4d032ffeee3f8c5e6dccc2ef1b2911732055778c3584e9e69bb4b", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-x86_64.exe" + "sha256": "93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "a94f899cd90b9221929edeb182b467500d81f75bd8a6b84b12b939a076e1a4df", - "url": "https://github.com/docker/compose/releases/download/v2.30.3/docker-compose-windows-aarch64.exe" + "sha256": "199abed1ee66d796170999bdd6cb36ad611773da6fa14147d5de4b55a62aa55f", + "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.30.3" + "version": "2.31.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ @@ -297,6 +317,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.4.0-rc.2" + "version": "27.4.0-rc.3" } } From 98c68d85db7c3aaf52fa9d640c40e462b19b9172 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 4 Dec 2024 15:15:41 -0800 Subject: [PATCH 424/667] Update 27-rc to 27.4.0-rc.4 --- 27-rc/cli/Dockerfile | 10 +++++----- 27-rc/dind-rootless/Dockerfile | 4 ++-- 27-rc/dind/Dockerfile | 8 ++++---- 27-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index b0c55285d..081d211cf 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.4.0-rc.3 +ENV DOCKER_VERSION 27.4.0-rc.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile index 140784e74..699605377 100644 --- a/27-rc/dind-rootless/Dockerfile +++ b/27-rc/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/test/x86_64/docker-rootless-extras-27.4.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile index 7d70bda4c..df275018b 100644 --- a/27-rc/dind/Dockerfile +++ b/27-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.3.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index 0c484d2bb..3d5adcb0f 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/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 27.4.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.3.zip +ENV DOCKER_VERSION 27.4.0-rc.4 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.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/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index 8d70c2843..b03cb915e 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/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 27.4.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.3.zip +ENV DOCKER_VERSION 27.4.0-rc.4 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.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/versions.json b/versions.json index 832ff240c..130ebc121 100644 --- a/versions.json +++ b/versions.json @@ -162,21 +162,21 @@ "27-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.4.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.4.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.4.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.4.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.3.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.4.zip" } }, "buildx": { @@ -317,6 +317,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.4.0-rc.3" + "version": "27.4.0-rc.4" } } From 5eefbd30c5c35f73cb944ce78b15e924a2768c2e Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 5 Dec 2024 14:13:25 +0100 Subject: [PATCH 425/667] Update to Alpine 3.21 --- 27-rc/cli/Dockerfile | 2 +- 27/cli/Dockerfile | 2 +- Dockerfile-cli.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index 081d211cf..da1e97cb1 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.21 RUN apk add --no-cache \ ca-certificates \ diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 0bcc9c49f..9b3e9f870 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.21 RUN apk add --no-cache \ ca-certificates \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 5b9eb2ac0..c47397831 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -1,5 +1,5 @@ {{ include "shared" -}} -FROM alpine:3.20 +FROM alpine:3.21 RUN apk add --no-cache \ ca-certificates \ From cf45da5b64c473e818a42e818dfb3151c398c613 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Thu, 5 Dec 2024 16:09:24 -0800 Subject: [PATCH 426/667] Adjust iptables-legacy binaries to new path in `/usr/sbin` https://gitlab.alpinelinux.org/alpine/aports/-/commit/c49f2fa7aeab3487da65ca4398477af73fde51cb --- 27-rc/dind/Dockerfile | 6 +++--- 27/dind/Dockerfile | 6 +++--- Dockerfile-dind.template | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile index df275018b..657a406a5 100644 --- a/27-rc/dind/Dockerfile +++ b/27-rc/dind/Dockerfile @@ -30,7 +30,7 @@ RUN set -eux; \ apk add --no-cache iptables-legacy; \ # set up a symlink farm we can use PATH to switch to legacy with mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 for f in \ iptables \ iptables-save \ @@ -40,8 +40,8 @@ RUN set -eux; \ ip6tables-restore \ ; do \ # "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 - b="/sbin/${f/tables/tables-legacy}"; \ +# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ "$b" --version; \ ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ done; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index 991bbb7c1..273773df1 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -30,7 +30,7 @@ RUN set -eux; \ apk add --no-cache iptables-legacy; \ # set up a symlink farm we can use PATH to switch to legacy with mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 for f in \ iptables \ iptables-save \ @@ -40,8 +40,8 @@ RUN set -eux; \ ip6tables-restore \ ; do \ # "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 - b="/sbin/${f/tables/tables-legacy}"; \ +# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ "$b" --version; \ ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ done; \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index a70743631..e9dafb72c 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -25,7 +25,7 @@ RUN set -eux; \ apk add --no-cache iptables-legacy; \ # set up a symlink farm we can use PATH to switch to legacy with mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://git.alpinelinux.org/aports/tree/main/iptables/APKBUILD?id=b215d54de159eacafecb13c68dfadce6eefd9ec9#n73 +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 for f in \ iptables \ iptables-save \ @@ -35,8 +35,8 @@ RUN set -eux; \ ip6tables-restore \ ; do \ # "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.19&name=iptables-legacy&arch=x86_64 - b="/sbin/${f/tables/tables-legacy}"; \ +# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ "$b" --version; \ ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ done; \ From fcc0458dba6e2ee908418bb2520850192462a23a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 6 Dec 2024 16:04:18 -0800 Subject: [PATCH 427/667] Update 27 to buildx 0.19.2 --- 27/cli/Dockerfile | 30 +++---- 27/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 80 +++++++++---------- 4 files changed, 61 insertions(+), 61 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 9b3e9f870..b760f1435 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.19.1 +ENV DOCKER_BUILDX_VERSION 0.19.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-amd64'; \ - sha256='153eace3d30c9efe9a7b94ea06c9d15ace59c8e6268d3481b8c175bd3df020f9'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-amd64'; \ + sha256='a5ff61c0b6d2c8ee20964a9d6dac7a7a6383c4a4a0ee8d354e983917578306ea'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v6'; \ - sha256='6f7e15248535bcae3730444bbf6164d076b9df7491b89040153f12d9e93a9f6b'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v6'; \ + sha256='1b94a6747c55098c1200a4544521d854720b621685d0078d43128e0911d17cf0'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v7'; \ - sha256='b2bb531e4f217c94951173a9e403002f6b18868227f09715c295a63f837cf5e4'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v7'; \ + sha256='a446237ace8919415fcb8599c47f2bc786436b910450d0546d15936788aeb3a7'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm64'; \ - sha256='9ecffda0a356957827de6b4ed86b151b420e84f81b2a58e2e2735506336ab891'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm64'; \ + sha256='bd54f0e28c29789da1679bad2dd94c1923786ccd2cd80dd3a0a1d560a6baf10c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-ppc64le'; \ - sha256='10ab6f3effac50e4150a3288013ad34e3cf4a0b307c7ffbf48dda9a5813e1bda'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-ppc64le'; \ + sha256='8312065303b9ff436d64e15b296951ce50b2e064b91d93befea19f09dc22115c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-riscv64'; \ - sha256='c89af9a424a109abd52205544377a9eac6027bb91c2fbe91d02cf91a6b53f7e8'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-riscv64'; \ + sha256='9b226b369830eca078a6af7105aa7ee167e39f3a21e30d25f95eb433cdb3de92'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-s390x'; \ - sha256='cfaf3883fe66787297c8df69e25f95246a74d630b5e2b6627cc563246f94b4f9'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-s390x'; \ + sha256='47572102e1888571da13804fcaed8294e1af33c576103b4dd9263288c0b6935d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 085b1f6a9..dda23a5a2 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2 +ENV DOCKER_BUILDX_VERSION 0.19.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index c11f9f4ff..dba77f1eb 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2 +ENV DOCKER_BUILDX_VERSION 0.19.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 130ebc121..a2524c338 100644 --- a/versions.json +++ b/versions.json @@ -22,72 +22,72 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.19.1.linux-amd64", - "sha256": "153eace3d30c9efe9a7b94ea06c9d15ace59c8e6268d3481b8c175bd3df020f9", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-amd64" + "file": "buildx-v0.19.2.linux-amd64", + "sha256": "a5ff61c0b6d2c8ee20964a9d6dac7a7a6383c4a4a0ee8d354e983917578306ea", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.19.1.linux-arm-v6", - "sha256": "6f7e15248535bcae3730444bbf6164d076b9df7491b89040153f12d9e93a9f6b", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v6" + "file": "buildx-v0.19.2.linux-arm-v6", + "sha256": "1b94a6747c55098c1200a4544521d854720b621685d0078d43128e0911d17cf0", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.19.1.linux-arm-v7", - "sha256": "b2bb531e4f217c94951173a9e403002f6b18868227f09715c295a63f837cf5e4", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v7" + "file": "buildx-v0.19.2.linux-arm-v7", + "sha256": "a446237ace8919415fcb8599c47f2bc786436b910450d0546d15936788aeb3a7", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.19.1.linux-arm64", - "sha256": "9ecffda0a356957827de6b4ed86b151b420e84f81b2a58e2e2735506336ab891", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm64" + "file": "buildx-v0.19.2.linux-arm64", + "sha256": "bd54f0e28c29789da1679bad2dd94c1923786ccd2cd80dd3a0a1d560a6baf10c", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.19.1.freebsd-amd64", - "sha256": "464ac326186dae232684b7ad623163a801fac2f0f8aa9a378460b8446cc1b3ec", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.freebsd-amd64" + "file": "buildx-v0.19.2.freebsd-amd64", + "sha256": "35cc73ce9b1581d2bc386778ef8e2125ad99791fad5e601c6deba3b60c572a8d", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.19.1.freebsd-arm64", - "sha256": "d05675b74fd33d01963ae043027b84993e4aa2db389fec280cf1796d2179d420", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.freebsd-arm64" + "file": "buildx-v0.19.2.freebsd-arm64", + "sha256": "88b9b868cd5aeff13812551950c752464b446dfcbc181b80e279abce66c811a1", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.freebsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.19.1.openbsd-amd64", - "sha256": "8d9d29fddbf90caf2dba5a138d79b346bf7602a257995fcdb4786c732a0ada96", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.openbsd-amd64" + "file": "buildx-v0.19.2.openbsd-amd64", + "sha256": "6bfeaecdb91982490ee11a2d286b0888c077f26ea856747bde9efe83480a737e", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.19.1.openbsd-arm64", - "sha256": "f19dd0a8fbf5b10ab5ff04fd363fb6fa75652427257b85fa91d9cc209ea6ed79", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.openbsd-arm64" + "file": "buildx-v0.19.2.openbsd-arm64", + "sha256": "d65a9adbca45acf538cc5bffc6c14a42618f5caf8f5d0f990ae0d02e2eb7bc9c", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.19.1.linux-ppc64le", - "sha256": "10ab6f3effac50e4150a3288013ad34e3cf4a0b307c7ffbf48dda9a5813e1bda", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-ppc64le" + "file": "buildx-v0.19.2.linux-ppc64le", + "sha256": "8312065303b9ff436d64e15b296951ce50b2e064b91d93befea19f09dc22115c", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.19.1.linux-riscv64", - "sha256": "c89af9a424a109abd52205544377a9eac6027bb91c2fbe91d02cf91a6b53f7e8", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-riscv64" + "file": "buildx-v0.19.2.linux-riscv64", + "sha256": "9b226b369830eca078a6af7105aa7ee167e39f3a21e30d25f95eb433cdb3de92", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.19.1.linux-s390x", - "sha256": "cfaf3883fe66787297c8df69e25f95246a74d630b5e2b6627cc563246f94b4f9", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-s390x" + "file": "buildx-v0.19.2.linux-s390x", + "sha256": "47572102e1888571da13804fcaed8294e1af33c576103b4dd9263288c0b6935d", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.19.1.windows-amd64.exe", - "sha256": "62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe" + "file": "buildx-v0.19.2.windows-amd64.exe", + "sha256": "6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.19.1.windows-arm64.exe", - "sha256": "17e5d2ba6e49b3a3ffe993eb9d449db65dd6e88af0284b51fdb4a9a7e4132deb", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-arm64.exe" + "file": "buildx-v0.19.2.windows-arm64.exe", + "sha256": "bb6b48d26f571600f1ab764772319fd174c7b50560cdc050055fe2e97388ae76", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-arm64.exe" } }, - "version": "0.19.1" + "version": "0.19.2" }, "compose": { "arches": { From 639add682b65d2eb9da54d9d92837f921c2aba94 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 6 Dec 2024 16:06:13 -0800 Subject: [PATCH 428/667] Update 27-rc to buildx 0.19.2 --- 27-rc/cli/Dockerfile | 30 +++---- .../windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 80 +++++++++---------- 4 files changed, 61 insertions(+), 61 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index da1e97cb1..85d603d5a 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.19.1 +ENV DOCKER_BUILDX_VERSION 0.19.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-amd64'; \ - sha256='153eace3d30c9efe9a7b94ea06c9d15ace59c8e6268d3481b8c175bd3df020f9'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-amd64'; \ + sha256='a5ff61c0b6d2c8ee20964a9d6dac7a7a6383c4a4a0ee8d354e983917578306ea'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v6'; \ - sha256='6f7e15248535bcae3730444bbf6164d076b9df7491b89040153f12d9e93a9f6b'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v6'; \ + sha256='1b94a6747c55098c1200a4544521d854720b621685d0078d43128e0911d17cf0'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v7'; \ - sha256='b2bb531e4f217c94951173a9e403002f6b18868227f09715c295a63f837cf5e4'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v7'; \ + sha256='a446237ace8919415fcb8599c47f2bc786436b910450d0546d15936788aeb3a7'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm64'; \ - sha256='9ecffda0a356957827de6b4ed86b151b420e84f81b2a58e2e2735506336ab891'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm64'; \ + sha256='bd54f0e28c29789da1679bad2dd94c1923786ccd2cd80dd3a0a1d560a6baf10c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-ppc64le'; \ - sha256='10ab6f3effac50e4150a3288013ad34e3cf4a0b307c7ffbf48dda9a5813e1bda'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-ppc64le'; \ + sha256='8312065303b9ff436d64e15b296951ce50b2e064b91d93befea19f09dc22115c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-riscv64'; \ - sha256='c89af9a424a109abd52205544377a9eac6027bb91c2fbe91d02cf91a6b53f7e8'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-riscv64'; \ + sha256='9b226b369830eca078a6af7105aa7ee167e39f3a21e30d25f95eb433cdb3de92'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-s390x'; \ - sha256='cfaf3883fe66787297c8df69e25f95246a74d630b5e2b6627cc563246f94b4f9'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-s390x'; \ + sha256='47572102e1888571da13804fcaed8294e1af33c576103b4dd9263288c0b6935d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index 3d5adcb0f..fcaa3f506 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2 +ENV DOCKER_BUILDX_VERSION 0.19.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index b03cb915e..52970d211 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2 +ENV DOCKER_BUILDX_VERSION 0.19.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index a2524c338..6d9053534 100644 --- a/versions.json +++ b/versions.json @@ -182,72 +182,72 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.19.1.linux-amd64", - "sha256": "153eace3d30c9efe9a7b94ea06c9d15ace59c8e6268d3481b8c175bd3df020f9", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-amd64" + "file": "buildx-v0.19.2.linux-amd64", + "sha256": "a5ff61c0b6d2c8ee20964a9d6dac7a7a6383c4a4a0ee8d354e983917578306ea", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.19.1.linux-arm-v6", - "sha256": "6f7e15248535bcae3730444bbf6164d076b9df7491b89040153f12d9e93a9f6b", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v6" + "file": "buildx-v0.19.2.linux-arm-v6", + "sha256": "1b94a6747c55098c1200a4544521d854720b621685d0078d43128e0911d17cf0", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.19.1.linux-arm-v7", - "sha256": "b2bb531e4f217c94951173a9e403002f6b18868227f09715c295a63f837cf5e4", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm-v7" + "file": "buildx-v0.19.2.linux-arm-v7", + "sha256": "a446237ace8919415fcb8599c47f2bc786436b910450d0546d15936788aeb3a7", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.19.1.linux-arm64", - "sha256": "9ecffda0a356957827de6b4ed86b151b420e84f81b2a58e2e2735506336ab891", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-arm64" + "file": "buildx-v0.19.2.linux-arm64", + "sha256": "bd54f0e28c29789da1679bad2dd94c1923786ccd2cd80dd3a0a1d560a6baf10c", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.19.1.freebsd-amd64", - "sha256": "464ac326186dae232684b7ad623163a801fac2f0f8aa9a378460b8446cc1b3ec", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.freebsd-amd64" + "file": "buildx-v0.19.2.freebsd-amd64", + "sha256": "35cc73ce9b1581d2bc386778ef8e2125ad99791fad5e601c6deba3b60c572a8d", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.19.1.freebsd-arm64", - "sha256": "d05675b74fd33d01963ae043027b84993e4aa2db389fec280cf1796d2179d420", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.freebsd-arm64" + "file": "buildx-v0.19.2.freebsd-arm64", + "sha256": "88b9b868cd5aeff13812551950c752464b446dfcbc181b80e279abce66c811a1", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.freebsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.19.1.openbsd-amd64", - "sha256": "8d9d29fddbf90caf2dba5a138d79b346bf7602a257995fcdb4786c732a0ada96", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.openbsd-amd64" + "file": "buildx-v0.19.2.openbsd-amd64", + "sha256": "6bfeaecdb91982490ee11a2d286b0888c077f26ea856747bde9efe83480a737e", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.19.1.openbsd-arm64", - "sha256": "f19dd0a8fbf5b10ab5ff04fd363fb6fa75652427257b85fa91d9cc209ea6ed79", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.openbsd-arm64" + "file": "buildx-v0.19.2.openbsd-arm64", + "sha256": "d65a9adbca45acf538cc5bffc6c14a42618f5caf8f5d0f990ae0d02e2eb7bc9c", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.19.1.linux-ppc64le", - "sha256": "10ab6f3effac50e4150a3288013ad34e3cf4a0b307c7ffbf48dda9a5813e1bda", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-ppc64le" + "file": "buildx-v0.19.2.linux-ppc64le", + "sha256": "8312065303b9ff436d64e15b296951ce50b2e064b91d93befea19f09dc22115c", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.19.1.linux-riscv64", - "sha256": "c89af9a424a109abd52205544377a9eac6027bb91c2fbe91d02cf91a6b53f7e8", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-riscv64" + "file": "buildx-v0.19.2.linux-riscv64", + "sha256": "9b226b369830eca078a6af7105aa7ee167e39f3a21e30d25f95eb433cdb3de92", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.19.1.linux-s390x", - "sha256": "cfaf3883fe66787297c8df69e25f95246a74d630b5e2b6627cc563246f94b4f9", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.linux-s390x" + "file": "buildx-v0.19.2.linux-s390x", + "sha256": "47572102e1888571da13804fcaed8294e1af33c576103b4dd9263288c0b6935d", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.19.1.windows-amd64.exe", - "sha256": "62c0ac3c49debde197ff855dbcd752829f4f31042336a42ba4033a43ec7a7ef2", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-amd64.exe" + "file": "buildx-v0.19.2.windows-amd64.exe", + "sha256": "6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.19.1.windows-arm64.exe", - "sha256": "17e5d2ba6e49b3a3ffe993eb9d449db65dd6e88af0284b51fdb4a9a7e4132deb", - "url": "https://github.com/docker/buildx/releases/download/v0.19.1/buildx-v0.19.1.windows-arm64.exe" + "file": "buildx-v0.19.2.windows-arm64.exe", + "sha256": "bb6b48d26f571600f1ab764772319fd174c7b50560cdc050055fe2e97388ae76", + "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-arm64.exe" } }, - "version": "0.19.1" + "version": "0.19.2" }, "compose": { "arches": { From 1cf4cea6a7e7b7fb5ab094ccec24c13f7c959fc6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 9 Dec 2024 09:51:24 -0800 Subject: [PATCH 429/667] Update 27 to 27.4.0 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index b760f1435..b9c5dd57e 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.3.1 +ENV DOCKER_VERSION 27.4.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.4.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.4.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.4.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.4.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index 7cd245d36..78ebb15ef 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.4.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.4.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index 273773df1..32648f95d 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.4.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.4.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.4.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.4.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index dda23a5a2..ae1f70eac 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.3.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.1.zip +ENV DOCKER_VERSION 27.4.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.4.0.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index dba77f1eb..7b0735472 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.3.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.3.1.zip +ENV DOCKER_VERSION 27.4.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.4.0.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/versions.json b/versions.json index 6d9053534..8cc3c02f2 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.3.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.4.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.4.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.4.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.4.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.3.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.4.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.4.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.3.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.4.0.zip" } }, "buildx": { @@ -157,7 +157,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.3.1" + "version": "27.4.0" }, "27-rc": { "arches": { From 54e6f9165ad35233ac5967e8e328efa1708aed6d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 9 Dec 2024 09:53:09 -0800 Subject: [PATCH 430/667] Update 27-rc --- 27-rc/cli/Dockerfile | 167 ------------- 27-rc/cli/docker-entrypoint.sh | 61 ----- 27-rc/cli/modprobe.sh | 20 -- 27-rc/dind-rootless/Dockerfile | 55 ---- 27-rc/dind/Dockerfile | 108 -------- 27-rc/dind/dockerd-entrypoint.sh | 234 ------------------ .../windows/windowsservercore-1809/Dockerfile | 91 ------- .../windowsservercore-ltsc2022/Dockerfile | 91 ------- versions.json | 161 +----------- 9 files changed, 1 insertion(+), 987 deletions(-) delete mode 100644 27-rc/cli/Dockerfile delete mode 100755 27-rc/cli/docker-entrypoint.sh delete mode 100755 27-rc/cli/modprobe.sh delete mode 100644 27-rc/dind-rootless/Dockerfile delete mode 100644 27-rc/dind/Dockerfile delete mode 100755 27-rc/dind/dockerd-entrypoint.sh delete mode 100644 27-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 27-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile deleted file mode 100644 index 85d603d5a..000000000 --- a/27-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.21 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 27.4.0-rc.4 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.4.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.4.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.4.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.4.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.19.2 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-amd64'; \ - sha256='a5ff61c0b6d2c8ee20964a9d6dac7a7a6383c4a4a0ee8d354e983917578306ea'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v6'; \ - sha256='1b94a6747c55098c1200a4544521d854720b621685d0078d43128e0911d17cf0'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v7'; \ - sha256='a446237ace8919415fcb8599c47f2bc786436b910450d0546d15936788aeb3a7'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm64'; \ - sha256='bd54f0e28c29789da1679bad2dd94c1923786ccd2cd80dd3a0a1d560a6baf10c'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-ppc64le'; \ - sha256='8312065303b9ff436d64e15b296951ce50b2e064b91d93befea19f09dc22115c'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-riscv64'; \ - sha256='9b226b369830eca078a6af7105aa7ee167e39f3a21e30d25f95eb433cdb3de92'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-s390x'; \ - sha256='47572102e1888571da13804fcaed8294e1af33c576103b4dd9263288c0b6935d'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.31.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-x86_64'; \ - sha256='8b5d2cb358427e654ada217cfdfedc00c4273f7a8ee07f27003a18d15461b6cd'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv6'; \ - sha256='5812e2fe5e8fdbaa984679ad5809779a0a0f054a423a63f6d15167b5d643db43'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv7'; \ - sha256='f8271667b0b0337cdd11a0f2920089f09b06bb4e5e3988e66ab23b5d18c3fa18'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-aarch64'; \ - sha256='a1f85584584d0c3c489f31f015c97eb543f1f0949fdc5ce3ded88c05a5188729'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-ppc64le'; \ - sha256='0f6149bb38f1722dea511fc80228d9bc7c3504cedaf662e09033d3aa89c70d93'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-riscv64'; \ - sha256='f3f9a94dc4bb8773bdcd70680a177171e8aeb15b98b979fe51b447a5c97c52d1'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-s390x'; \ - sha256='6635a146193c797ed11ba3a6e9d7b1da5df0f1215ccd3c52f712001e58413f20'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/27-rc/cli/docker-entrypoint.sh b/27-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/27-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/27-rc/cli/modprobe.sh b/27-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/27-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile deleted file mode 100644 index 699605377..000000000 --- a/27-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.4.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.4.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile deleted file mode 100644 index 657a406a5..000000000 --- a/27-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.4.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.4.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.4.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.4.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:27-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/27-rc/dind/dockerd-entrypoint.sh b/27-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 6c06bb811..000000000 --- a/27-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index fcaa3f506..000000000 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.4.0-rc.4 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.31.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 52970d211..000000000 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.4.0-rc.4 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.31.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 8cc3c02f2..aed36e1ff 100644 --- a/versions.json +++ b/versions.json @@ -159,164 +159,5 @@ ], "version": "27.4.0" }, - "27-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.4.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.4.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.4.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.4.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.4.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.19.2.linux-amd64", - "sha256": "a5ff61c0b6d2c8ee20964a9d6dac7a7a6383c4a4a0ee8d354e983917578306ea", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.19.2.linux-arm-v6", - "sha256": "1b94a6747c55098c1200a4544521d854720b621685d0078d43128e0911d17cf0", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.19.2.linux-arm-v7", - "sha256": "a446237ace8919415fcb8599c47f2bc786436b910450d0546d15936788aeb3a7", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.19.2.linux-arm64", - "sha256": "bd54f0e28c29789da1679bad2dd94c1923786ccd2cd80dd3a0a1d560a6baf10c", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.19.2.freebsd-amd64", - "sha256": "35cc73ce9b1581d2bc386778ef8e2125ad99791fad5e601c6deba3b60c572a8d", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.19.2.freebsd-arm64", - "sha256": "88b9b868cd5aeff13812551950c752464b446dfcbc181b80e279abce66c811a1", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.freebsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.19.2.openbsd-amd64", - "sha256": "6bfeaecdb91982490ee11a2d286b0888c077f26ea856747bde9efe83480a737e", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.19.2.openbsd-arm64", - "sha256": "d65a9adbca45acf538cc5bffc6c14a42618f5caf8f5d0f990ae0d02e2eb7bc9c", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.19.2.linux-ppc64le", - "sha256": "8312065303b9ff436d64e15b296951ce50b2e064b91d93befea19f09dc22115c", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.19.2.linux-riscv64", - "sha256": "9b226b369830eca078a6af7105aa7ee167e39f3a21e30d25f95eb433cdb3de92", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.19.2.linux-s390x", - "sha256": "47572102e1888571da13804fcaed8294e1af33c576103b4dd9263288c0b6935d", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.19.2.windows-amd64.exe", - "sha256": "6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.19.2.windows-arm64.exe", - "sha256": "bb6b48d26f571600f1ab764772319fd174c7b50560cdc050055fe2e97388ae76", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-arm64.exe" - } - }, - "version": "0.19.2" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "8b5d2cb358427e654ada217cfdfedc00c4273f7a8ee07f27003a18d15461b6cd", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "5812e2fe5e8fdbaa984679ad5809779a0a0f054a423a63f6d15167b5d643db43", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "f8271667b0b0337cdd11a0f2920089f09b06bb4e5e3988e66ab23b5d18c3fa18", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "a1f85584584d0c3c489f31f015c97eb543f1f0949fdc5ce3ded88c05a5188729", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "1016a4b0bc5554c12152a986c06725db491e0e91f94f7a566d425f1225b399e7", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "53b19ae8edb06e86c06bad9723b5b5c791370a9498fede6f89537d915eced1d5", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "0f6149bb38f1722dea511fc80228d9bc7c3504cedaf662e09033d3aa89c70d93", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "f3f9a94dc4bb8773bdcd70680a177171e8aeb15b98b979fe51b447a5c97c52d1", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "6635a146193c797ed11ba3a6e9d7b1da5df0f1215ccd3c52f712001e58413f20", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "199abed1ee66d796170999bdd6cb36ad611773da6fa14147d5de4b55a62aa55f", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.31.0" - }, - "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "27.4.0-rc.4" - } + "27-rc": null } From 7f2fa41d70b70b6b813e1c11c8654956b20da6ca Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 13 Dec 2024 04:04:24 -0800 Subject: [PATCH 431/667] Update 27 to compose 2.32.0 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index b9c5dd57e..7a15e69bb 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.31.0 +ENV DOCKER_COMPOSE_VERSION 2.32.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-x86_64'; \ - sha256='8b5d2cb358427e654ada217cfdfedc00c4273f7a8ee07f27003a18d15461b6cd'; \ + url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-x86_64'; \ + sha256='c204bc7058fb881b2a39175df5c3596f6b08ef9e358d7236df7cc781f74695bd'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv6'; \ - sha256='5812e2fe5e8fdbaa984679ad5809779a0a0f054a423a63f6d15167b5d643db43'; \ + url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-armv6'; \ + sha256='d72e2d4b8ab71fa4b0132b451f43267aaca980c4ee9cb670ae6f83fa101747e7'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv7'; \ - sha256='f8271667b0b0337cdd11a0f2920089f09b06bb4e5e3988e66ab23b5d18c3fa18'; \ + url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-armv7'; \ + sha256='9e6b63bd2b863c4564fa61c18f2515f0130a8800f12a35c2836fdd6a044ff222'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-aarch64'; \ - sha256='a1f85584584d0c3c489f31f015c97eb543f1f0949fdc5ce3ded88c05a5188729'; \ + url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-aarch64'; \ + sha256='0bb65b36b32750a876cfdd5720e811ba1b70cb9eca72536fdf4ac7949fbc20e1'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-ppc64le'; \ - sha256='0f6149bb38f1722dea511fc80228d9bc7c3504cedaf662e09033d3aa89c70d93'; \ + url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-ppc64le'; \ + sha256='5e05371a1b0f3bb4e9785aa9957c98bff625aab675a59e5ae6c75e7e7ec41027'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-riscv64'; \ - sha256='f3f9a94dc4bb8773bdcd70680a177171e8aeb15b98b979fe51b447a5c97c52d1'; \ + url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-riscv64'; \ + sha256='726362c280a764de1249927857e51bb9f1321a0c4d5192dc0a5e2134ac29a999'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-s390x'; \ - sha256='6635a146193c797ed11ba3a6e9d7b1da5df0f1215ccd3c52f712001e58413f20'; \ + url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-s390x'; \ + sha256='d9c117c743131c3addc933d71d6ee5cbf70951ce34c43b765a7d57c80ef58429'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index ae1f70eac..8401d1b9e 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.31.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75 +ENV DOCKER_COMPOSE_VERSION 2.32.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 b18f79e01e22362faede43844a2131038c49b52692150deb8ea81f98ab286fe6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 7b0735472..edeef09c5 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.31.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75 +ENV DOCKER_COMPOSE_VERSION 2.32.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 b18f79e01e22362faede43844a2131038c49b52692150deb8ea81f98ab286fe6 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index aed36e1ff..570db36be 100644 --- a/versions.json +++ b/versions.json @@ -93,61 +93,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "8b5d2cb358427e654ada217cfdfedc00c4273f7a8ee07f27003a18d15461b6cd", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-x86_64" + "sha256": "c204bc7058fb881b2a39175df5c3596f6b08ef9e358d7236df7cc781f74695bd", + "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "5812e2fe5e8fdbaa984679ad5809779a0a0f054a423a63f6d15167b5d643db43", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv6" + "sha256": "d72e2d4b8ab71fa4b0132b451f43267aaca980c4ee9cb670ae6f83fa101747e7", + "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "f8271667b0b0337cdd11a0f2920089f09b06bb4e5e3988e66ab23b5d18c3fa18", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-armv7" + "sha256": "9e6b63bd2b863c4564fa61c18f2515f0130a8800f12a35c2836fdd6a044ff222", + "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "a1f85584584d0c3c489f31f015c97eb543f1f0949fdc5ce3ded88c05a5188729", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-aarch64" + "sha256": "0bb65b36b32750a876cfdd5720e811ba1b70cb9eca72536fdf4ac7949fbc20e1", + "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "1016a4b0bc5554c12152a986c06725db491e0e91f94f7a566d425f1225b399e7", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-darwin-x86_64" + "sha256": "10415e8bb159c055edb9f8e7b6872e406ba09011b52c5da970099c671fe30b11", + "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "53b19ae8edb06e86c06bad9723b5b5c791370a9498fede6f89537d915eced1d5", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-darwin-aarch64" + "sha256": "19975e13c31552fe62555e765b3d8450892af06b709f3b44c122e11fc8a62e20", + "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "0f6149bb38f1722dea511fc80228d9bc7c3504cedaf662e09033d3aa89c70d93", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-ppc64le" + "sha256": "5e05371a1b0f3bb4e9785aa9957c98bff625aab675a59e5ae6c75e7e7ec41027", + "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "f3f9a94dc4bb8773bdcd70680a177171e8aeb15b98b979fe51b447a5c97c52d1", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-riscv64" + "sha256": "726362c280a764de1249927857e51bb9f1321a0c4d5192dc0a5e2134ac29a999", + "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6635a146193c797ed11ba3a6e9d7b1da5df0f1215ccd3c52f712001e58413f20", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-linux-s390x" + "sha256": "d9c117c743131c3addc933d71d6ee5cbf70951ce34c43b765a7d57c80ef58429", + "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "93fa851954c19e0e19b753817eca37c81c9f4394b0db1853ebc66cd62230ea75", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-x86_64.exe" + "sha256": "b18f79e01e22362faede43844a2131038c49b52692150deb8ea81f98ab286fe6", + "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "199abed1ee66d796170999bdd6cb36ad611773da6fa14147d5de4b55a62aa55f", - "url": "https://github.com/docker/compose/releases/download/v2.31.0/docker-compose-windows-aarch64.exe" + "sha256": "587826a810466896cca524907d00478f2f9904facff1233c1d3121cd9f5f57c6", + "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.31.0" + "version": "2.32.0" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 65eea8f08ce7b8a5d5450fac9a50b2d68e7a7dd3 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 13 Dec 2024 15:02:49 -0800 Subject: [PATCH 432/667] Simplify and update `verify-templating.yml` This makes it print out a diff when there is an error (instead of just a list of files that are wrong), which will make the error more obvious. I also added `workflow_dispatch` so we can run it manually. --- .github/workflows/verify-templating.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml index 2e1fb7872..e822ba6bb 100644 --- a/.github/workflows/verify-templating.yml +++ b/.github/workflows/verify-templating.yml @@ -3,6 +3,7 @@ name: Verify Templating on: pull_request: push: + workflow_dispatch: defaults: run: @@ -14,9 +15,5 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Apply Templates - run: ./apply-templates.sh - - name: Check Git Status - run: | - status="$(git status --short)" - [ -z "$status" ] + - run: ./apply-templates.sh + - run: git diff --exit-code From 72c158f954f9384dcc541ec4ddf97c25ea633867 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 16 Dec 2024 10:04:19 -0800 Subject: [PATCH 433/667] Update 27 to compose 2.32.1 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 7a15e69bb..cc0930a19 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.32.0 +ENV DOCKER_COMPOSE_VERSION 2.32.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-x86_64'; \ - sha256='c204bc7058fb881b2a39175df5c3596f6b08ef9e358d7236df7cc781f74695bd'; \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-x86_64'; \ + sha256='ec81c40f138db0ca3aee71c2fffb0075636bea5a02109c75177f66e1b8f568b9'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-armv6'; \ - sha256='d72e2d4b8ab71fa4b0132b451f43267aaca980c4ee9cb670ae6f83fa101747e7'; \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv6'; \ + sha256='a570825379639804e406c07fe73d052e7909e74c976c3a5cc6cad74a871e405d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-armv7'; \ - sha256='9e6b63bd2b863c4564fa61c18f2515f0130a8800f12a35c2836fdd6a044ff222'; \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv7'; \ + sha256='bd6a7456eb94e3bb7df31be43f84af9882149abe417f5b7a2635108325e7e604'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-aarch64'; \ - sha256='0bb65b36b32750a876cfdd5720e811ba1b70cb9eca72536fdf4ac7949fbc20e1'; \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-aarch64'; \ + sha256='7aa6406406be13c075e92cfbf322470318a9ad7a58c93a9fb3a215dc14aed8bd'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-ppc64le'; \ - sha256='5e05371a1b0f3bb4e9785aa9957c98bff625aab675a59e5ae6c75e7e7ec41027'; \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-ppc64le'; \ + sha256='4e56b1e8f5d5e68ce66d5a156a96597b1d7534a94dd2d846d288797008e044eb'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-riscv64'; \ - sha256='726362c280a764de1249927857e51bb9f1321a0c4d5192dc0a5e2134ac29a999'; \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-riscv64'; \ + sha256='686bba58b9c2cad3edc4045dadb36ed2e2d4b0b72ada8eed832b6a9561fdb50d'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-s390x'; \ - sha256='d9c117c743131c3addc933d71d6ee5cbf70951ce34c43b765a7d57c80ef58429'; \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-s390x'; \ + sha256='a40fdae1e4a3b90186bc06712b0b19079877bf408f39b3425bf65048e19bd8aa'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 8401d1b9e..d7df61658 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 b18f79e01e22362faede43844a2131038c49b52692150deb8ea81f98ab286fe6 +ENV DOCKER_COMPOSE_VERSION 2.32.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index edeef09c5..81ed9dd43 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 b18f79e01e22362faede43844a2131038c49b52692150deb8ea81f98ab286fe6 +ENV DOCKER_COMPOSE_VERSION 2.32.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 570db36be..d7d1f226b 100644 --- a/versions.json +++ b/versions.json @@ -93,61 +93,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "c204bc7058fb881b2a39175df5c3596f6b08ef9e358d7236df7cc781f74695bd", - "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-x86_64" + "sha256": "ec81c40f138db0ca3aee71c2fffb0075636bea5a02109c75177f66e1b8f568b9", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "d72e2d4b8ab71fa4b0132b451f43267aaca980c4ee9cb670ae6f83fa101747e7", - "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-armv6" + "sha256": "a570825379639804e406c07fe73d052e7909e74c976c3a5cc6cad74a871e405d", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9e6b63bd2b863c4564fa61c18f2515f0130a8800f12a35c2836fdd6a044ff222", - "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-armv7" + "sha256": "bd6a7456eb94e3bb7df31be43f84af9882149abe417f5b7a2635108325e7e604", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "0bb65b36b32750a876cfdd5720e811ba1b70cb9eca72536fdf4ac7949fbc20e1", - "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-aarch64" + "sha256": "7aa6406406be13c075e92cfbf322470318a9ad7a58c93a9fb3a215dc14aed8bd", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "10415e8bb159c055edb9f8e7b6872e406ba09011b52c5da970099c671fe30b11", - "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-darwin-x86_64" + "sha256": "371f0be73773cc7f3d076b69fb7d06ec8beb874cf937710cc12d0914ef1cd774", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "19975e13c31552fe62555e765b3d8450892af06b709f3b44c122e11fc8a62e20", - "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-darwin-aarch64" + "sha256": "bc8864301641f9e301fc5efc0c44dfe5d4a4085bf9a564a7a151d8f91aa76f4c", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "5e05371a1b0f3bb4e9785aa9957c98bff625aab675a59e5ae6c75e7e7ec41027", - "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-ppc64le" + "sha256": "4e56b1e8f5d5e68ce66d5a156a96597b1d7534a94dd2d846d288797008e044eb", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "726362c280a764de1249927857e51bb9f1321a0c4d5192dc0a5e2134ac29a999", - "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-riscv64" + "sha256": "686bba58b9c2cad3edc4045dadb36ed2e2d4b0b72ada8eed832b6a9561fdb50d", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "d9c117c743131c3addc933d71d6ee5cbf70951ce34c43b765a7d57c80ef58429", - "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-linux-s390x" + "sha256": "a40fdae1e4a3b90186bc06712b0b19079877bf408f39b3425bf65048e19bd8aa", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "b18f79e01e22362faede43844a2131038c49b52692150deb8ea81f98ab286fe6", - "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-windows-x86_64.exe" + "sha256": "5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "587826a810466896cca524907d00478f2f9904facff1233c1d3121cd9f5f57c6", - "url": "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-windows-aarch64.exe" + "sha256": "ec2abd5a9fd34057adce68f824b45f2551f1f39ad0d9e6a3df7ab811c10a0b20", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.32.0" + "version": "2.32.1" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From c0d0710b63167055f22c8fcae043df69dceb108b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Dec 2024 10:04:18 -0800 Subject: [PATCH 434/667] Update 27 to buildx 0.19.3 --- 27/cli/Dockerfile | 30 +++---- 27/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 80 +++++++++---------- 4 files changed, 61 insertions(+), 61 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index cc0930a19..ce5612673 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.19.2 +ENV DOCKER_BUILDX_VERSION 0.19.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-amd64'; \ - sha256='a5ff61c0b6d2c8ee20964a9d6dac7a7a6383c4a4a0ee8d354e983917578306ea'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-amd64'; \ + sha256='32ed111e941e385c2fb8261eba06a4056915718fd606f8278834ac1931d261a2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v6'; \ - sha256='1b94a6747c55098c1200a4544521d854720b621685d0078d43128e0911d17cf0'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v6'; \ + sha256='744352489292ab1439e4b4facfd49f81cbe25e71e205908bd9ec44618759739c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v7'; \ - sha256='a446237ace8919415fcb8599c47f2bc786436b910450d0546d15936788aeb3a7'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v7'; \ + sha256='5a83e1663b595147ac0225d876fc77e3b441e62dac7a59523ba7003eb6733b8b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm64'; \ - sha256='bd54f0e28c29789da1679bad2dd94c1923786ccd2cd80dd3a0a1d560a6baf10c'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm64'; \ + sha256='138b587399b27bb61945a36d67866177b85dea1155101a2be63c7ab715f18a2e'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-ppc64le'; \ - sha256='8312065303b9ff436d64e15b296951ce50b2e064b91d93befea19f09dc22115c'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-ppc64le'; \ + sha256='b9eb337b16a75ad45ff846134d34599169bc6dfdb168fb51303fc6b08ed9f31e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-riscv64'; \ - sha256='9b226b369830eca078a6af7105aa7ee167e39f3a21e30d25f95eb433cdb3de92'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-riscv64'; \ + sha256='de8151fe6ced7118f2d680e1d1e7c5cb00496ca0e8b0f8b261450c6636d86978'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-s390x'; \ - sha256='47572102e1888571da13804fcaed8294e1af33c576103b4dd9263288c0b6935d'; \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-s390x'; \ + sha256='422a9a0250d52dfdd6b78c8152fbf9df41993be4c7add93438c22122ff6c7da8'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index d7df61658..97b40dce5 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432 +ENV DOCKER_BUILDX_VERSION 0.19.3 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 81ed9dd43..9d9857a0a 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432 +ENV DOCKER_BUILDX_VERSION 0.19.3 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index d7d1f226b..c4f9eef93 100644 --- a/versions.json +++ b/versions.json @@ -22,72 +22,72 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.19.2.linux-amd64", - "sha256": "a5ff61c0b6d2c8ee20964a9d6dac7a7a6383c4a4a0ee8d354e983917578306ea", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-amd64" + "file": "buildx-v0.19.3.linux-amd64", + "sha256": "32ed111e941e385c2fb8261eba06a4056915718fd606f8278834ac1931d261a2", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.19.2.linux-arm-v6", - "sha256": "1b94a6747c55098c1200a4544521d854720b621685d0078d43128e0911d17cf0", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v6" + "file": "buildx-v0.19.3.linux-arm-v6", + "sha256": "744352489292ab1439e4b4facfd49f81cbe25e71e205908bd9ec44618759739c", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.19.2.linux-arm-v7", - "sha256": "a446237ace8919415fcb8599c47f2bc786436b910450d0546d15936788aeb3a7", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm-v7" + "file": "buildx-v0.19.3.linux-arm-v7", + "sha256": "5a83e1663b595147ac0225d876fc77e3b441e62dac7a59523ba7003eb6733b8b", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.19.2.linux-arm64", - "sha256": "bd54f0e28c29789da1679bad2dd94c1923786ccd2cd80dd3a0a1d560a6baf10c", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-arm64" + "file": "buildx-v0.19.3.linux-arm64", + "sha256": "138b587399b27bb61945a36d67866177b85dea1155101a2be63c7ab715f18a2e", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.19.2.freebsd-amd64", - "sha256": "35cc73ce9b1581d2bc386778ef8e2125ad99791fad5e601c6deba3b60c572a8d", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.freebsd-amd64" + "file": "buildx-v0.19.3.freebsd-amd64", + "sha256": "dc8de077eda0f3d8d1433d790286ef7b88cb8bda01f6a83f2e6fd23d66a8e483", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.19.2.freebsd-arm64", - "sha256": "88b9b868cd5aeff13812551950c752464b446dfcbc181b80e279abce66c811a1", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.freebsd-arm64" + "file": "buildx-v0.19.3.freebsd-arm64", + "sha256": "e846d4f727bb6f6fccd186b1325866aa26c281361cbaa43a6760ae9af7ade1dc", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.freebsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.19.2.openbsd-amd64", - "sha256": "6bfeaecdb91982490ee11a2d286b0888c077f26ea856747bde9efe83480a737e", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.openbsd-amd64" + "file": "buildx-v0.19.3.openbsd-amd64", + "sha256": "9cb27ed38bad3b61f4a50ea7411391aec13b278fc6af37230fdaee709706a5a2", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.19.2.openbsd-arm64", - "sha256": "d65a9adbca45acf538cc5bffc6c14a42618f5caf8f5d0f990ae0d02e2eb7bc9c", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.openbsd-arm64" + "file": "buildx-v0.19.3.openbsd-arm64", + "sha256": "d16ebd5bf33f9c98bed2019fa5fb8778ea77e3bb472737a2e23ab6737e2ea599", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.19.2.linux-ppc64le", - "sha256": "8312065303b9ff436d64e15b296951ce50b2e064b91d93befea19f09dc22115c", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-ppc64le" + "file": "buildx-v0.19.3.linux-ppc64le", + "sha256": "b9eb337b16a75ad45ff846134d34599169bc6dfdb168fb51303fc6b08ed9f31e", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.19.2.linux-riscv64", - "sha256": "9b226b369830eca078a6af7105aa7ee167e39f3a21e30d25f95eb433cdb3de92", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-riscv64" + "file": "buildx-v0.19.3.linux-riscv64", + "sha256": "de8151fe6ced7118f2d680e1d1e7c5cb00496ca0e8b0f8b261450c6636d86978", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-riscv64" }, "s390x": { - "file": "buildx-v0.19.2.linux-s390x", - "sha256": "47572102e1888571da13804fcaed8294e1af33c576103b4dd9263288c0b6935d", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.linux-s390x" + "file": "buildx-v0.19.3.linux-s390x", + "sha256": "422a9a0250d52dfdd6b78c8152fbf9df41993be4c7add93438c22122ff6c7da8", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.19.2.windows-amd64.exe", - "sha256": "6b13e5bdd8a40548886b69cc94716ff2f9a06db513983a0f158f80a3f2486432", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-amd64.exe" + "file": "buildx-v0.19.3.windows-amd64.exe", + "sha256": "fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.19.2.windows-arm64.exe", - "sha256": "bb6b48d26f571600f1ab764772319fd174c7b50560cdc050055fe2e97388ae76", - "url": "https://github.com/docker/buildx/releases/download/v0.19.2/buildx-v0.19.2.windows-arm64.exe" + "file": "buildx-v0.19.3.windows-arm64.exe", + "sha256": "f799675f89cdff20c76bc0b17953045df2cea47d09613779c4bcfd63ebee7bd9", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-arm64.exe" } }, - "version": "0.19.2" + "version": "0.19.3" }, "compose": { "arches": { From 1188b8d14e45467307857b8fa3196f07b3826f50 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 18 Dec 2024 04:04:25 -0800 Subject: [PATCH 435/667] Update 27 to 27.4.1 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index ce5612673..09db452e2 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.4.0 +ENV DOCKER_VERSION 27.4.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.4.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.4.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.4.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.4.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index 78ebb15ef..7f0559866 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.4.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.4.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index 32648f95d..6bbd755f5 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.4.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.4.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.4.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.4.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 97b40dce5..343a43d37 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.4.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.4.0.zip +ENV DOCKER_VERSION 27.4.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.4.1.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 9d9857a0a..2f36956eb 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.4.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.4.0.zip +ENV DOCKER_VERSION 27.4.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.4.1.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/versions.json b/versions.json index c4f9eef93..7955aef76 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.4.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.4.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.4.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.4.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.4.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.4.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.4.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.4.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.4.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.4.1.zip" } }, "buildx": { @@ -157,7 +157,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.4.0" + "version": "27.4.1" }, "27-rc": null } From 982bc8b4002d8c38372ef646d034ce7ca592f82a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 23 Dec 2024 04:04:24 -0800 Subject: [PATCH 436/667] Update 27-rc to 27.5.0-rc.1, buildx 0.19.3, compose 2.32.1 --- 27-rc/cli/Dockerfile | 167 +++++++++++++ 27-rc/cli/docker-entrypoint.sh | 61 +++++ 27-rc/cli/modprobe.sh | 20 ++ 27-rc/dind-rootless/Dockerfile | 55 ++++ 27-rc/dind/Dockerfile | 108 ++++++++ 27-rc/dind/dockerd-entrypoint.sh | 234 ++++++++++++++++++ .../windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ versions.json | 161 +++++++++++- 9 files changed, 987 insertions(+), 1 deletion(-) create mode 100644 27-rc/cli/Dockerfile create mode 100755 27-rc/cli/docker-entrypoint.sh create mode 100755 27-rc/cli/modprobe.sh create mode 100644 27-rc/dind-rootless/Dockerfile create mode 100644 27-rc/dind/Dockerfile create mode 100755 27-rc/dind/dockerd-entrypoint.sh create mode 100644 27-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 27-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile new file mode 100644 index 000000000..7c4939d22 --- /dev/null +++ b/27-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.21 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 27.5.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.19.3 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-amd64'; \ + sha256='32ed111e941e385c2fb8261eba06a4056915718fd606f8278834ac1931d261a2'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v6'; \ + sha256='744352489292ab1439e4b4facfd49f81cbe25e71e205908bd9ec44618759739c'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v7'; \ + sha256='5a83e1663b595147ac0225d876fc77e3b441e62dac7a59523ba7003eb6733b8b'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm64'; \ + sha256='138b587399b27bb61945a36d67866177b85dea1155101a2be63c7ab715f18a2e'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-ppc64le'; \ + sha256='b9eb337b16a75ad45ff846134d34599169bc6dfdb168fb51303fc6b08ed9f31e'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-riscv64'; \ + sha256='de8151fe6ced7118f2d680e1d1e7c5cb00496ca0e8b0f8b261450c6636d86978'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-s390x'; \ + sha256='422a9a0250d52dfdd6b78c8152fbf9df41993be4c7add93438c22122ff6c7da8'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.32.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-x86_64'; \ + sha256='ec81c40f138db0ca3aee71c2fffb0075636bea5a02109c75177f66e1b8f568b9'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv6'; \ + sha256='a570825379639804e406c07fe73d052e7909e74c976c3a5cc6cad74a871e405d'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv7'; \ + sha256='bd6a7456eb94e3bb7df31be43f84af9882149abe417f5b7a2635108325e7e604'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-aarch64'; \ + sha256='7aa6406406be13c075e92cfbf322470318a9ad7a58c93a9fb3a215dc14aed8bd'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-ppc64le'; \ + sha256='4e56b1e8f5d5e68ce66d5a156a96597b1d7534a94dd2d846d288797008e044eb'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-riscv64'; \ + sha256='686bba58b9c2cad3edc4045dadb36ed2e2d4b0b72ada8eed832b6a9561fdb50d'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-s390x'; \ + sha256='a40fdae1e4a3b90186bc06712b0b19079877bf408f39b3425bf65048e19bd8aa'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/27-rc/cli/docker-entrypoint.sh b/27-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/27-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/27-rc/cli/modprobe.sh b/27-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/27-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..d7b7af92e --- /dev/null +++ b/27-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.5.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.5.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/rootlesskit-docker-proxy' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile new file mode 100644 index 000000000..38bb26644 --- /dev/null +++ b/27-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:27-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:27-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/27-rc/dind/dockerd-entrypoint.sh b/27-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..6c06bb811 --- /dev/null +++ b/27-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,234 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..9b828b695 --- /dev/null +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.5.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.19.3 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.32.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..ee8c23c36 --- /dev/null +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.5.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.19.3 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.32.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 7955aef76..e546f1a36 100644 --- a/versions.json +++ b/versions.json @@ -159,5 +159,164 @@ ], "version": "27.4.1" }, - "27-rc": null + "27-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.5.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.5.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.19.3.linux-amd64", + "sha256": "32ed111e941e385c2fb8261eba06a4056915718fd606f8278834ac1931d261a2", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.19.3.linux-arm-v6", + "sha256": "744352489292ab1439e4b4facfd49f81cbe25e71e205908bd9ec44618759739c", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.19.3.linux-arm-v7", + "sha256": "5a83e1663b595147ac0225d876fc77e3b441e62dac7a59523ba7003eb6733b8b", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.19.3.linux-arm64", + "sha256": "138b587399b27bb61945a36d67866177b85dea1155101a2be63c7ab715f18a2e", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.19.3.freebsd-amd64", + "sha256": "dc8de077eda0f3d8d1433d790286ef7b88cb8bda01f6a83f2e6fd23d66a8e483", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.19.3.freebsd-arm64", + "sha256": "e846d4f727bb6f6fccd186b1325866aa26c281361cbaa43a6760ae9af7ade1dc", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.freebsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.19.3.openbsd-amd64", + "sha256": "9cb27ed38bad3b61f4a50ea7411391aec13b278fc6af37230fdaee709706a5a2", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.19.3.openbsd-arm64", + "sha256": "d16ebd5bf33f9c98bed2019fa5fb8778ea77e3bb472737a2e23ab6737e2ea599", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.19.3.linux-ppc64le", + "sha256": "b9eb337b16a75ad45ff846134d34599169bc6dfdb168fb51303fc6b08ed9f31e", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.19.3.linux-riscv64", + "sha256": "de8151fe6ced7118f2d680e1d1e7c5cb00496ca0e8b0f8b261450c6636d86978", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.19.3.linux-s390x", + "sha256": "422a9a0250d52dfdd6b78c8152fbf9df41993be4c7add93438c22122ff6c7da8", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.19.3.windows-amd64.exe", + "sha256": "fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.19.3.windows-arm64.exe", + "sha256": "f799675f89cdff20c76bc0b17953045df2cea47d09613779c4bcfd63ebee7bd9", + "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-arm64.exe" + } + }, + "version": "0.19.3" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "ec81c40f138db0ca3aee71c2fffb0075636bea5a02109c75177f66e1b8f568b9", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "a570825379639804e406c07fe73d052e7909e74c976c3a5cc6cad74a871e405d", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "bd6a7456eb94e3bb7df31be43f84af9882149abe417f5b7a2635108325e7e604", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "7aa6406406be13c075e92cfbf322470318a9ad7a58c93a9fb3a215dc14aed8bd", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "371f0be73773cc7f3d076b69fb7d06ec8beb874cf937710cc12d0914ef1cd774", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "bc8864301641f9e301fc5efc0c44dfe5d4a4085bf9a564a7a151d8f91aa76f4c", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "4e56b1e8f5d5e68ce66d5a156a96597b1d7534a94dd2d846d288797008e044eb", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "686bba58b9c2cad3edc4045dadb36ed2e2d4b0b72ada8eed832b6a9561fdb50d", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "a40fdae1e4a3b90186bc06712b0b19079877bf408f39b3425bf65048e19bd8aa", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "ec2abd5a9fd34057adce68f824b45f2551f1f39ad0d9e6a3df7ab811c10a0b20", + "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.32.1" + }, + "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "27.5.0-rc.1" + } } From 13c485aa8cff687237f89d784e7f7bc93346663a Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 8 Jan 2025 10:49:16 -0800 Subject: [PATCH 437/667] Update compose-scraping logic to match buildx (especially to ignore provenance.json) --- versions.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/versions.sh b/versions.sh index 645d51e74..69a13d0df 100755 --- a/versions.sh +++ b/versions.sh @@ -152,12 +152,12 @@ for composeVersion in $composeVersions; do file: .[1], url: ("https://github.com/docker/compose/releases/download/v" + $version + "/" + .[1]), } + | select(.file | test("[.]json$") | not) | { ( .file - | ltrimstr("docker-compose-") - | rtrimstr(".exe") - | split("-") - | if .[0] == "linux" then "" else .[0] + "-" end + | capture("-(?linux|windows|darwin|freebsd|openbsd)-(?[^.]+)(?[.]exe)?$") + // error("failed to parse os-arch from filename: " + .) + | if .os == "linux" then "" else .os + "-" end + ({ aarch64: "arm64v8", armv6: "arm32v6", @@ -166,7 +166,7 @@ for composeVersion in $composeVersions; do riscv64: "riscv64", s390x: "s390x", x86_64: "amd64", - }[.[1]] // error("unknown compose architecture: " + .[1])) + }[.arch] // error("unknown compose architecture: " + .arch)) ): . } ) | add From dc4d40d7c5c6c823da63644efa433ee358d0e6f5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 8 Jan 2025 10:50:16 -0800 Subject: [PATCH 438/667] Update 27 to compose 2.32.2 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 09db452e2..3f2201791 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.32.1 +ENV DOCKER_COMPOSE_VERSION 2.32.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-x86_64'; \ - sha256='ec81c40f138db0ca3aee71c2fffb0075636bea5a02109c75177f66e1b8f568b9'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-x86_64'; \ + sha256='e746a42f33113ca1057a72adff5f07d584b38c94dd7cc8368f6a30c276367710'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv6'; \ - sha256='a570825379639804e406c07fe73d052e7909e74c976c3a5cc6cad74a871e405d'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv6'; \ + sha256='7a527b3c21d2e9f1f98cef3b37ad2fcb84f410dfcd67916e6fad78123155d216'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv7'; \ - sha256='bd6a7456eb94e3bb7df31be43f84af9882149abe417f5b7a2635108325e7e604'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv7'; \ + sha256='556710d309f248fffbfab835c1142e32ea9dd0b1ccfbdbeea2624db0f35c68a6'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-aarch64'; \ - sha256='7aa6406406be13c075e92cfbf322470318a9ad7a58c93a9fb3a215dc14aed8bd'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-aarch64'; \ + sha256='c5b795b304410d46a754ecacfee36bf1f341e3bcd562a882525115e09ed90d6c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-ppc64le'; \ - sha256='4e56b1e8f5d5e68ce66d5a156a96597b1d7534a94dd2d846d288797008e044eb'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-ppc64le'; \ + sha256='4eb2cac95680923c50bd1b1248e460cafe99ebaa063e394dd5178bc4065e0efa'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-riscv64'; \ - sha256='686bba58b9c2cad3edc4045dadb36ed2e2d4b0b72ada8eed832b6a9561fdb50d'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-riscv64'; \ + sha256='d007f7dd93ea364d1e341e53308691f61cebb86a45b63d002157c22cba80510d'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-s390x'; \ - sha256='a40fdae1e4a3b90186bc06712b0b19079877bf408f39b3425bf65048e19bd8aa'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-s390x'; \ + sha256='b91db23ea592c81162bb92b042873569cbe1e381400ad45447521cfa984bc184'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 343a43d37..7c8186273 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213 +ENV DOCKER_COMPOSE_VERSION 2.32.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 2f36956eb..d65323354 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213 +ENV DOCKER_COMPOSE_VERSION 2.32.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index e546f1a36..69a31f753 100644 --- a/versions.json +++ b/versions.json @@ -93,61 +93,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ec81c40f138db0ca3aee71c2fffb0075636bea5a02109c75177f66e1b8f568b9", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-x86_64" + "sha256": "e746a42f33113ca1057a72adff5f07d584b38c94dd7cc8368f6a30c276367710", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a570825379639804e406c07fe73d052e7909e74c976c3a5cc6cad74a871e405d", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv6" + "sha256": "7a527b3c21d2e9f1f98cef3b37ad2fcb84f410dfcd67916e6fad78123155d216", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "bd6a7456eb94e3bb7df31be43f84af9882149abe417f5b7a2635108325e7e604", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv7" + "sha256": "556710d309f248fffbfab835c1142e32ea9dd0b1ccfbdbeea2624db0f35c68a6", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "7aa6406406be13c075e92cfbf322470318a9ad7a58c93a9fb3a215dc14aed8bd", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-aarch64" + "sha256": "c5b795b304410d46a754ecacfee36bf1f341e3bcd562a882525115e09ed90d6c", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "371f0be73773cc7f3d076b69fb7d06ec8beb874cf937710cc12d0914ef1cd774", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-darwin-x86_64" + "sha256": "e6a4a24eb51fec1d9376aea505220b22d76743dad5eec33779bb5fa5b2ecd56c", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "bc8864301641f9e301fc5efc0c44dfe5d4a4085bf9a564a7a151d8f91aa76f4c", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-darwin-aarch64" + "sha256": "a603d6c3df1fce4e560a88750f914d18f9a81a76897be6f7edb244c625f8e385", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4e56b1e8f5d5e68ce66d5a156a96597b1d7534a94dd2d846d288797008e044eb", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-ppc64le" + "sha256": "4eb2cac95680923c50bd1b1248e460cafe99ebaa063e394dd5178bc4065e0efa", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "686bba58b9c2cad3edc4045dadb36ed2e2d4b0b72ada8eed832b6a9561fdb50d", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-riscv64" + "sha256": "d007f7dd93ea364d1e341e53308691f61cebb86a45b63d002157c22cba80510d", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "a40fdae1e4a3b90186bc06712b0b19079877bf408f39b3425bf65048e19bd8aa", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-s390x" + "sha256": "b91db23ea592c81162bb92b042873569cbe1e381400ad45447521cfa984bc184", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe" + "sha256": "f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "ec2abd5a9fd34057adce68f824b45f2551f1f39ad0d9e6a3df7ab811c10a0b20", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-aarch64.exe" + "sha256": "b61d5086feeb5323a9e263060e024f9d685d60b97a13d172c24cd385b27f302f", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.32.1" + "version": "2.32.2" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From eb3c938f4f09b2b1173d99b4d9f6a1b34167e6a7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 8 Jan 2025 10:52:25 -0800 Subject: [PATCH 439/667] Update 27-rc to 27.5.0-rc.2, compose 2.32.2 --- 27-rc/cli/Dockerfile | 40 ++++++------ 27-rc/dind-rootless/Dockerfile | 4 +- 27-rc/dind/Dockerfile | 8 +-- .../windows/windowsservercore-1809/Dockerfile | 10 +-- .../windowsservercore-ltsc2022/Dockerfile | 10 +-- versions.json | 62 +++++++++---------- 6 files changed, 67 insertions(+), 67 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index 7c4939d22..bf3997ceb 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.5.0-rc.1 +ENV DOCKER_VERSION 27.5.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.32.1 +ENV DOCKER_COMPOSE_VERSION 2.32.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-x86_64'; \ - sha256='ec81c40f138db0ca3aee71c2fffb0075636bea5a02109c75177f66e1b8f568b9'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-x86_64'; \ + sha256='e746a42f33113ca1057a72adff5f07d584b38c94dd7cc8368f6a30c276367710'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv6'; \ - sha256='a570825379639804e406c07fe73d052e7909e74c976c3a5cc6cad74a871e405d'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv6'; \ + sha256='7a527b3c21d2e9f1f98cef3b37ad2fcb84f410dfcd67916e6fad78123155d216'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv7'; \ - sha256='bd6a7456eb94e3bb7df31be43f84af9882149abe417f5b7a2635108325e7e604'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv7'; \ + sha256='556710d309f248fffbfab835c1142e32ea9dd0b1ccfbdbeea2624db0f35c68a6'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-aarch64'; \ - sha256='7aa6406406be13c075e92cfbf322470318a9ad7a58c93a9fb3a215dc14aed8bd'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-aarch64'; \ + sha256='c5b795b304410d46a754ecacfee36bf1f341e3bcd562a882525115e09ed90d6c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-ppc64le'; \ - sha256='4e56b1e8f5d5e68ce66d5a156a96597b1d7534a94dd2d846d288797008e044eb'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-ppc64le'; \ + sha256='4eb2cac95680923c50bd1b1248e460cafe99ebaa063e394dd5178bc4065e0efa'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-riscv64'; \ - sha256='686bba58b9c2cad3edc4045dadb36ed2e2d4b0b72ada8eed832b6a9561fdb50d'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-riscv64'; \ + sha256='d007f7dd93ea364d1e341e53308691f61cebb86a45b63d002157c22cba80510d'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-s390x'; \ - sha256='a40fdae1e4a3b90186bc06712b0b19079877bf408f39b3425bf65048e19bd8aa'; \ + url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-s390x'; \ + sha256='b91db23ea592c81162bb92b042873569cbe1e381400ad45447521cfa984bc184'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile index d7b7af92e..4f351fa66 100644 --- a/27-rc/dind-rootless/Dockerfile +++ b/27-rc/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/test/x86_64/docker-rootless-extras-27.5.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.5.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.5.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.5.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile index 38bb26644..5894b5afd 100644 --- a/27-rc/dind/Dockerfile +++ b/27-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index 9b828b695..52e69a299 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/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 27.5.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.1.zip +ENV DOCKER_VERSION 27.5.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.2.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) @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213 +ENV DOCKER_COMPOSE_VERSION 2.32.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index ee8c23c36..f380d7151 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/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 27.5.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.1.zip +ENV DOCKER_VERSION 27.5.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.2.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) @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213 +ENV DOCKER_COMPOSE_VERSION 2.32.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 69a31f753..c75f1333c 100644 --- a/versions.json +++ b/versions.json @@ -162,21 +162,21 @@ "27-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.5.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.5.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.5.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.5.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.2.zip" } }, "buildx": { @@ -253,61 +253,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ec81c40f138db0ca3aee71c2fffb0075636bea5a02109c75177f66e1b8f568b9", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-x86_64" + "sha256": "e746a42f33113ca1057a72adff5f07d584b38c94dd7cc8368f6a30c276367710", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a570825379639804e406c07fe73d052e7909e74c976c3a5cc6cad74a871e405d", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv6" + "sha256": "7a527b3c21d2e9f1f98cef3b37ad2fcb84f410dfcd67916e6fad78123155d216", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "bd6a7456eb94e3bb7df31be43f84af9882149abe417f5b7a2635108325e7e604", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-armv7" + "sha256": "556710d309f248fffbfab835c1142e32ea9dd0b1ccfbdbeea2624db0f35c68a6", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "7aa6406406be13c075e92cfbf322470318a9ad7a58c93a9fb3a215dc14aed8bd", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-aarch64" + "sha256": "c5b795b304410d46a754ecacfee36bf1f341e3bcd562a882525115e09ed90d6c", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "371f0be73773cc7f3d076b69fb7d06ec8beb874cf937710cc12d0914ef1cd774", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-darwin-x86_64" + "sha256": "e6a4a24eb51fec1d9376aea505220b22d76743dad5eec33779bb5fa5b2ecd56c", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "bc8864301641f9e301fc5efc0c44dfe5d4a4085bf9a564a7a151d8f91aa76f4c", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-darwin-aarch64" + "sha256": "a603d6c3df1fce4e560a88750f914d18f9a81a76897be6f7edb244c625f8e385", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4e56b1e8f5d5e68ce66d5a156a96597b1d7534a94dd2d846d288797008e044eb", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-ppc64le" + "sha256": "4eb2cac95680923c50bd1b1248e460cafe99ebaa063e394dd5178bc4065e0efa", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "686bba58b9c2cad3edc4045dadb36ed2e2d4b0b72ada8eed832b6a9561fdb50d", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-riscv64" + "sha256": "d007f7dd93ea364d1e341e53308691f61cebb86a45b63d002157c22cba80510d", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "a40fdae1e4a3b90186bc06712b0b19079877bf408f39b3425bf65048e19bd8aa", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-linux-s390x" + "sha256": "b91db23ea592c81162bb92b042873569cbe1e381400ad45447521cfa984bc184", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "5dc7ac86e8d3972c2c68066c6ac370daf0a42b7c8d3338336c9dbde34af06213", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-x86_64.exe" + "sha256": "f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "ec2abd5a9fd34057adce68f824b45f2551f1f39ad0d9e6a3df7ab811c10a0b20", - "url": "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-windows-aarch64.exe" + "sha256": "b61d5086feeb5323a9e263060e024f9d685d60b97a13d172c24cd385b27f302f", + "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.32.1" + "version": "2.32.2" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ @@ -317,6 +317,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.5.0-rc.1" + "version": "27.5.0-rc.2" } } From 0ef843ef82a1a89b2822fc95beab619daf7a3feb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 13 Jan 2025 10:04:17 -0800 Subject: [PATCH 440/667] Update 27 to compose 2.32.3 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 3f2201791..f808b4f53 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.32.2 +ENV DOCKER_COMPOSE_VERSION 2.32.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-x86_64'; \ - sha256='e746a42f33113ca1057a72adff5f07d584b38c94dd7cc8368f6a30c276367710'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-x86_64'; \ + sha256='6ef48e4bf25fbf1f1ad50c43b797cc24e12e4cde29765076b4145e09e35f5713'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv6'; \ - sha256='7a527b3c21d2e9f1f98cef3b37ad2fcb84f410dfcd67916e6fad78123155d216'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv6'; \ + sha256='8f415a76ad62ff621b26b37a94841ee0d4480862d8da55320c1c8fc9db4d8359'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv7'; \ - sha256='556710d309f248fffbfab835c1142e32ea9dd0b1ccfbdbeea2624db0f35c68a6'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv7'; \ + sha256='64314c73a7d34e4a8b9dad87bab857304fb60b0293703d02be436893e1c37f33'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-aarch64'; \ - sha256='c5b795b304410d46a754ecacfee36bf1f341e3bcd562a882525115e09ed90d6c'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-aarch64'; \ + sha256='d1a04a3eb7fd738cc78e518d179a03adb9fe531ee422b8a14bdccf36d654b73a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-ppc64le'; \ - sha256='4eb2cac95680923c50bd1b1248e460cafe99ebaa063e394dd5178bc4065e0efa'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-ppc64le'; \ + sha256='23bddc8119bce6c0eeef1461bc0526291d60de9042b28780012033ba4082090e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-riscv64'; \ - sha256='d007f7dd93ea364d1e341e53308691f61cebb86a45b63d002157c22cba80510d'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-riscv64'; \ + sha256='c4bac574a2123938de4ef410e7cef92d079abe266298c93257cbcc4e17134184'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-s390x'; \ - sha256='b91db23ea592c81162bb92b042873569cbe1e381400ad45447521cfa984bc184'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-s390x'; \ + sha256='6c0c7d9b6119f68b3dcbf816cf9e5782eb7cea8d2433f8a51b95a41276241e18'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 7c8186273..8148df7af 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec +ENV DOCKER_COMPOSE_VERSION 2.32.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index d65323354..17c1ae7d4 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec +ENV DOCKER_COMPOSE_VERSION 2.32.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index c75f1333c..076711672 100644 --- a/versions.json +++ b/versions.json @@ -93,61 +93,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e746a42f33113ca1057a72adff5f07d584b38c94dd7cc8368f6a30c276367710", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-x86_64" + "sha256": "6ef48e4bf25fbf1f1ad50c43b797cc24e12e4cde29765076b4145e09e35f5713", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "7a527b3c21d2e9f1f98cef3b37ad2fcb84f410dfcd67916e6fad78123155d216", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv6" + "sha256": "8f415a76ad62ff621b26b37a94841ee0d4480862d8da55320c1c8fc9db4d8359", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "556710d309f248fffbfab835c1142e32ea9dd0b1ccfbdbeea2624db0f35c68a6", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv7" + "sha256": "64314c73a7d34e4a8b9dad87bab857304fb60b0293703d02be436893e1c37f33", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "c5b795b304410d46a754ecacfee36bf1f341e3bcd562a882525115e09ed90d6c", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-aarch64" + "sha256": "d1a04a3eb7fd738cc78e518d179a03adb9fe531ee422b8a14bdccf36d654b73a", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "e6a4a24eb51fec1d9376aea505220b22d76743dad5eec33779bb5fa5b2ecd56c", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-darwin-x86_64" + "sha256": "c8778e195961a0adbcff263cc8df1c5c4409b51f8aaa8a56999f7d8f9b74438a", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "a603d6c3df1fce4e560a88750f914d18f9a81a76897be6f7edb244c625f8e385", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-darwin-aarch64" + "sha256": "f8e210d6b35844d9dd36a52d0b109d367ae7f25df773bd8ff30e69e061499392", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4eb2cac95680923c50bd1b1248e460cafe99ebaa063e394dd5178bc4065e0efa", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-ppc64le" + "sha256": "23bddc8119bce6c0eeef1461bc0526291d60de9042b28780012033ba4082090e", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "d007f7dd93ea364d1e341e53308691f61cebb86a45b63d002157c22cba80510d", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-riscv64" + "sha256": "c4bac574a2123938de4ef410e7cef92d079abe266298c93257cbcc4e17134184", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "b91db23ea592c81162bb92b042873569cbe1e381400ad45447521cfa984bc184", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-s390x" + "sha256": "6c0c7d9b6119f68b3dcbf816cf9e5782eb7cea8d2433f8a51b95a41276241e18", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe" + "sha256": "67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "b61d5086feeb5323a9e263060e024f9d685d60b97a13d172c24cd385b27f302f", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-aarch64.exe" + "sha256": "da13657d04c9ecfc6995617875985e2a794ca31a2f3abdac79b8df41c08b4704", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.32.2" + "version": "2.32.3" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 9c7b6e80b78f5737214e416f8cc957ae5559a7a2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 13 Jan 2025 10:06:11 -0800 Subject: [PATCH 441/667] Update 27-rc to compose 2.32.3 --- 27-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile index bf3997ceb..e0fdb3018 100644 --- a/27-rc/cli/Dockerfile +++ b/27-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.32.2 +ENV DOCKER_COMPOSE_VERSION 2.32.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-x86_64'; \ - sha256='e746a42f33113ca1057a72adff5f07d584b38c94dd7cc8368f6a30c276367710'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-x86_64'; \ + sha256='6ef48e4bf25fbf1f1ad50c43b797cc24e12e4cde29765076b4145e09e35f5713'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv6'; \ - sha256='7a527b3c21d2e9f1f98cef3b37ad2fcb84f410dfcd67916e6fad78123155d216'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv6'; \ + sha256='8f415a76ad62ff621b26b37a94841ee0d4480862d8da55320c1c8fc9db4d8359'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv7'; \ - sha256='556710d309f248fffbfab835c1142e32ea9dd0b1ccfbdbeea2624db0f35c68a6'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv7'; \ + sha256='64314c73a7d34e4a8b9dad87bab857304fb60b0293703d02be436893e1c37f33'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-aarch64'; \ - sha256='c5b795b304410d46a754ecacfee36bf1f341e3bcd562a882525115e09ed90d6c'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-aarch64'; \ + sha256='d1a04a3eb7fd738cc78e518d179a03adb9fe531ee422b8a14bdccf36d654b73a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-ppc64le'; \ - sha256='4eb2cac95680923c50bd1b1248e460cafe99ebaa063e394dd5178bc4065e0efa'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-ppc64le'; \ + sha256='23bddc8119bce6c0eeef1461bc0526291d60de9042b28780012033ba4082090e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-riscv64'; \ - sha256='d007f7dd93ea364d1e341e53308691f61cebb86a45b63d002157c22cba80510d'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-riscv64'; \ + sha256='c4bac574a2123938de4ef410e7cef92d079abe266298c93257cbcc4e17134184'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-s390x'; \ - sha256='b91db23ea592c81162bb92b042873569cbe1e381400ad45447521cfa984bc184'; \ + url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-s390x'; \ + sha256='6c0c7d9b6119f68b3dcbf816cf9e5782eb7cea8d2433f8a51b95a41276241e18'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile index 52e69a299..7ee78b02d 100644 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ b/27-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec +ENV DOCKER_COMPOSE_VERSION 2.32.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile index f380d7151..685c7258a 100644 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec +ENV DOCKER_COMPOSE_VERSION 2.32.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 076711672..2f58a3ee3 100644 --- a/versions.json +++ b/versions.json @@ -253,61 +253,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e746a42f33113ca1057a72adff5f07d584b38c94dd7cc8368f6a30c276367710", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-x86_64" + "sha256": "6ef48e4bf25fbf1f1ad50c43b797cc24e12e4cde29765076b4145e09e35f5713", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "7a527b3c21d2e9f1f98cef3b37ad2fcb84f410dfcd67916e6fad78123155d216", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv6" + "sha256": "8f415a76ad62ff621b26b37a94841ee0d4480862d8da55320c1c8fc9db4d8359", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "556710d309f248fffbfab835c1142e32ea9dd0b1ccfbdbeea2624db0f35c68a6", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-armv7" + "sha256": "64314c73a7d34e4a8b9dad87bab857304fb60b0293703d02be436893e1c37f33", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "c5b795b304410d46a754ecacfee36bf1f341e3bcd562a882525115e09ed90d6c", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-aarch64" + "sha256": "d1a04a3eb7fd738cc78e518d179a03adb9fe531ee422b8a14bdccf36d654b73a", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "e6a4a24eb51fec1d9376aea505220b22d76743dad5eec33779bb5fa5b2ecd56c", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-darwin-x86_64" + "sha256": "c8778e195961a0adbcff263cc8df1c5c4409b51f8aaa8a56999f7d8f9b74438a", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "a603d6c3df1fce4e560a88750f914d18f9a81a76897be6f7edb244c625f8e385", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-darwin-aarch64" + "sha256": "f8e210d6b35844d9dd36a52d0b109d367ae7f25df773bd8ff30e69e061499392", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4eb2cac95680923c50bd1b1248e460cafe99ebaa063e394dd5178bc4065e0efa", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-ppc64le" + "sha256": "23bddc8119bce6c0eeef1461bc0526291d60de9042b28780012033ba4082090e", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "d007f7dd93ea364d1e341e53308691f61cebb86a45b63d002157c22cba80510d", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-riscv64" + "sha256": "c4bac574a2123938de4ef410e7cef92d079abe266298c93257cbcc4e17134184", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "b91db23ea592c81162bb92b042873569cbe1e381400ad45447521cfa984bc184", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-linux-s390x" + "sha256": "6c0c7d9b6119f68b3dcbf816cf9e5782eb7cea8d2433f8a51b95a41276241e18", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "f384ad29e5187745cad4c18a14ddafd5e7a748c68b5bd991599b1756e36d3bec", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-x86_64.exe" + "sha256": "67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "b61d5086feeb5323a9e263060e024f9d685d60b97a13d172c24cd385b27f302f", - "url": "https://github.com/docker/compose/releases/download/v2.32.2/docker-compose-windows-aarch64.exe" + "sha256": "da13657d04c9ecfc6995617875985e2a794ca31a2f3abdac79b8df41c08b4704", + "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.32.2" + "version": "2.32.3" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 49e7a0aa907a6033c2482efbf8e25bb97588b184 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 13 Jan 2025 14:12:41 -0800 Subject: [PATCH 442/667] Update 27 to 27.5.0 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index f808b4f53..2c99a9541 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.4.1 +ENV DOCKER_VERSION 27.5.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.5.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index 7f0559866..30039d1d7 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.5.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index 6bbd755f5..cc3622899 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.5.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 8148df7af..dcee4f25e 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.4.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.4.1.zip +ENV DOCKER_VERSION 27.5.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.0.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 17c1ae7d4..6b95d96bd 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.4.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.4.1.zip +ENV DOCKER_VERSION 27.5.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.0.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/versions.json b/versions.json index 2f58a3ee3..5162bd080 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.4.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.4.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.5.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.5.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.4.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.5.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.4.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.5.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.4.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.4.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.5.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.4.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.5.0.zip" } }, "buildx": { @@ -157,7 +157,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.4.1" + "version": "27.5.0" }, "27-rc": { "arches": { From 83fdb8e2cf0947321ac0f88926773fea67c420e6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 13 Jan 2025 14:14:41 -0800 Subject: [PATCH 443/667] Update 27-rc --- 27-rc/cli/Dockerfile | 167 ------------- 27-rc/cli/docker-entrypoint.sh | 61 ----- 27-rc/cli/modprobe.sh | 20 -- 27-rc/dind-rootless/Dockerfile | 55 ---- 27-rc/dind/Dockerfile | 108 -------- 27-rc/dind/dockerd-entrypoint.sh | 234 ------------------ .../windows/windowsservercore-1809/Dockerfile | 91 ------- .../windowsservercore-ltsc2022/Dockerfile | 91 ------- versions.json | 161 +----------- 9 files changed, 1 insertion(+), 987 deletions(-) delete mode 100644 27-rc/cli/Dockerfile delete mode 100755 27-rc/cli/docker-entrypoint.sh delete mode 100755 27-rc/cli/modprobe.sh delete mode 100644 27-rc/dind-rootless/Dockerfile delete mode 100644 27-rc/dind/Dockerfile delete mode 100755 27-rc/dind/dockerd-entrypoint.sh delete mode 100644 27-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 27-rc/windows/windowsservercore-ltsc2022/Dockerfile diff --git a/27-rc/cli/Dockerfile b/27-rc/cli/Dockerfile deleted file mode 100644 index e0fdb3018..000000000 --- a/27-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.21 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 27.5.0-rc.2 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.19.3 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-amd64'; \ - sha256='32ed111e941e385c2fb8261eba06a4056915718fd606f8278834ac1931d261a2'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v6'; \ - sha256='744352489292ab1439e4b4facfd49f81cbe25e71e205908bd9ec44618759739c'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v7'; \ - sha256='5a83e1663b595147ac0225d876fc77e3b441e62dac7a59523ba7003eb6733b8b'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm64'; \ - sha256='138b587399b27bb61945a36d67866177b85dea1155101a2be63c7ab715f18a2e'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-ppc64le'; \ - sha256='b9eb337b16a75ad45ff846134d34599169bc6dfdb168fb51303fc6b08ed9f31e'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-riscv64'; \ - sha256='de8151fe6ced7118f2d680e1d1e7c5cb00496ca0e8b0f8b261450c6636d86978'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-s390x'; \ - sha256='422a9a0250d52dfdd6b78c8152fbf9df41993be4c7add93438c22122ff6c7da8'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.32.3 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-x86_64'; \ - sha256='6ef48e4bf25fbf1f1ad50c43b797cc24e12e4cde29765076b4145e09e35f5713'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv6'; \ - sha256='8f415a76ad62ff621b26b37a94841ee0d4480862d8da55320c1c8fc9db4d8359'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv7'; \ - sha256='64314c73a7d34e4a8b9dad87bab857304fb60b0293703d02be436893e1c37f33'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-aarch64'; \ - sha256='d1a04a3eb7fd738cc78e518d179a03adb9fe531ee422b8a14bdccf36d654b73a'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-ppc64le'; \ - sha256='23bddc8119bce6c0eeef1461bc0526291d60de9042b28780012033ba4082090e'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-riscv64'; \ - sha256='c4bac574a2123938de4ef410e7cef92d079abe266298c93257cbcc4e17134184'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-s390x'; \ - sha256='6c0c7d9b6119f68b3dcbf816cf9e5782eb7cea8d2433f8a51b95a41276241e18'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/27-rc/cli/docker-entrypoint.sh b/27-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/27-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/27-rc/cli/modprobe.sh b/27-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/27-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/27-rc/dind-rootless/Dockerfile b/27-rc/dind-rootless/Dockerfile deleted file mode 100644 index 4f351fa66..000000000 --- a/27-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.5.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.5.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/27-rc/dind/Dockerfile b/27-rc/dind/Dockerfile deleted file mode 100644 index 5894b5afd..000000000 --- a/27-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:27-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/27-rc/dind/dockerd-entrypoint.sh b/27-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 6c06bb811..000000000 --- a/27-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/27-rc/windows/windowsservercore-1809/Dockerfile b/27-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 7ee78b02d..000000000 --- a/27-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.5.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.3 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile b/27-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 685c7258a..000000000 --- a/27-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.5.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.3 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 5162bd080..009d154b4 100644 --- a/versions.json +++ b/versions.json @@ -159,164 +159,5 @@ ], "version": "27.5.0" }, - "27-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.5.0-rc.2.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.2.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.2.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.5.0-rc.2.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-27.5.0-rc.2.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.19.3.linux-amd64", - "sha256": "32ed111e941e385c2fb8261eba06a4056915718fd606f8278834ac1931d261a2", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.19.3.linux-arm-v6", - "sha256": "744352489292ab1439e4b4facfd49f81cbe25e71e205908bd9ec44618759739c", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.19.3.linux-arm-v7", - "sha256": "5a83e1663b595147ac0225d876fc77e3b441e62dac7a59523ba7003eb6733b8b", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.19.3.linux-arm64", - "sha256": "138b587399b27bb61945a36d67866177b85dea1155101a2be63c7ab715f18a2e", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.19.3.freebsd-amd64", - "sha256": "dc8de077eda0f3d8d1433d790286ef7b88cb8bda01f6a83f2e6fd23d66a8e483", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.19.3.freebsd-arm64", - "sha256": "e846d4f727bb6f6fccd186b1325866aa26c281361cbaa43a6760ae9af7ade1dc", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.freebsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.19.3.openbsd-amd64", - "sha256": "9cb27ed38bad3b61f4a50ea7411391aec13b278fc6af37230fdaee709706a5a2", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.19.3.openbsd-arm64", - "sha256": "d16ebd5bf33f9c98bed2019fa5fb8778ea77e3bb472737a2e23ab6737e2ea599", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.19.3.linux-ppc64le", - "sha256": "b9eb337b16a75ad45ff846134d34599169bc6dfdb168fb51303fc6b08ed9f31e", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.19.3.linux-riscv64", - "sha256": "de8151fe6ced7118f2d680e1d1e7c5cb00496ca0e8b0f8b261450c6636d86978", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.19.3.linux-s390x", - "sha256": "422a9a0250d52dfdd6b78c8152fbf9df41993be4c7add93438c22122ff6c7da8", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.19.3.windows-amd64.exe", - "sha256": "fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.19.3.windows-arm64.exe", - "sha256": "f799675f89cdff20c76bc0b17953045df2cea47d09613779c4bcfd63ebee7bd9", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-arm64.exe" - } - }, - "version": "0.19.3" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "6ef48e4bf25fbf1f1ad50c43b797cc24e12e4cde29765076b4145e09e35f5713", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "8f415a76ad62ff621b26b37a94841ee0d4480862d8da55320c1c8fc9db4d8359", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "64314c73a7d34e4a8b9dad87bab857304fb60b0293703d02be436893e1c37f33", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "d1a04a3eb7fd738cc78e518d179a03adb9fe531ee422b8a14bdccf36d654b73a", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "c8778e195961a0adbcff263cc8df1c5c4409b51f8aaa8a56999f7d8f9b74438a", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "f8e210d6b35844d9dd36a52d0b109d367ae7f25df773bd8ff30e69e061499392", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "23bddc8119bce6c0eeef1461bc0526291d60de9042b28780012033ba4082090e", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "c4bac574a2123938de4ef410e7cef92d079abe266298c93257cbcc4e17134184", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "6c0c7d9b6119f68b3dcbf816cf9e5782eb7cea8d2433f8a51b95a41276241e18", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "da13657d04c9ecfc6995617875985e2a794ca31a2f3abdac79b8df41c08b4704", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.32.3" - }, - "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "27.5.0-rc.2" - } + "27-rc": null } From 188ce9e3ab5fe4aff074273041d4532fa870723d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 15 Jan 2025 16:04:17 -0800 Subject: [PATCH 444/667] Update 27 to compose 2.32.4 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 2c99a9541..a72bc9ed1 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.32.3 +ENV DOCKER_COMPOSE_VERSION 2.32.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-x86_64'; \ - sha256='6ef48e4bf25fbf1f1ad50c43b797cc24e12e4cde29765076b4145e09e35f5713'; \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64'; \ + sha256='ed1917fb54db184192ea9d0717bcd59e3662ea79db48bff36d3475516c480a6b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv6'; \ - sha256='8f415a76ad62ff621b26b37a94841ee0d4480862d8da55320c1c8fc9db4d8359'; \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv6'; \ + sha256='1e9c5c4cbdda569164a067ce9246c3a969bac253192526ffe0d0e3a99a4cbd0a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv7'; \ - sha256='64314c73a7d34e4a8b9dad87bab857304fb60b0293703d02be436893e1c37f33'; \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv7'; \ + sha256='c12bb3c23db5c409a15dbb13be4b61faa74c881d5db5f8a2816f60c19c35251a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-aarch64'; \ - sha256='d1a04a3eb7fd738cc78e518d179a03adb9fe531ee422b8a14bdccf36d654b73a'; \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-aarch64'; \ + sha256='0c4591cf3b1ed039adcd803dbbeddf757375fc08c11245b0154135f838495a2f'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-ppc64le'; \ - sha256='23bddc8119bce6c0eeef1461bc0526291d60de9042b28780012033ba4082090e'; \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-ppc64le'; \ + sha256='23adf27e7637fcb65b37d8a214712c4a83d1a3cbc6be0fefd7b6e5cdfd89cb79'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-riscv64'; \ - sha256='c4bac574a2123938de4ef410e7cef92d079abe266298c93257cbcc4e17134184'; \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-riscv64'; \ + sha256='392f705e6b1ad99b8bf761f4be8211d531fbacbcad1326f14f1cdcfc68c25a6b'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-s390x'; \ - sha256='6c0c7d9b6119f68b3dcbf816cf9e5782eb7cea8d2433f8a51b95a41276241e18'; \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-s390x'; \ + sha256='fe2d32c99c34c39a5156fb3bfb73949be746644a3f887b628bfc971c37fa1b90'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index dcee4f25e..53940c5a3 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674 +ENV DOCKER_COMPOSE_VERSION 2.32.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 6b95d96bd..96584f848 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674 +ENV DOCKER_COMPOSE_VERSION 2.32.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 009d154b4..3c836f063 100644 --- a/versions.json +++ b/versions.json @@ -93,61 +93,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6ef48e4bf25fbf1f1ad50c43b797cc24e12e4cde29765076b4145e09e35f5713", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-x86_64" + "sha256": "ed1917fb54db184192ea9d0717bcd59e3662ea79db48bff36d3475516c480a6b", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "8f415a76ad62ff621b26b37a94841ee0d4480862d8da55320c1c8fc9db4d8359", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv6" + "sha256": "1e9c5c4cbdda569164a067ce9246c3a969bac253192526ffe0d0e3a99a4cbd0a", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "64314c73a7d34e4a8b9dad87bab857304fb60b0293703d02be436893e1c37f33", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv7" + "sha256": "c12bb3c23db5c409a15dbb13be4b61faa74c881d5db5f8a2816f60c19c35251a", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d1a04a3eb7fd738cc78e518d179a03adb9fe531ee422b8a14bdccf36d654b73a", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-aarch64" + "sha256": "0c4591cf3b1ed039adcd803dbbeddf757375fc08c11245b0154135f838495a2f", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c8778e195961a0adbcff263cc8df1c5c4409b51f8aaa8a56999f7d8f9b74438a", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-darwin-x86_64" + "sha256": "bd6f3b3b93032f47ad2c017e92df302651c9a649f4b533455371877eaaa76585", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "f8e210d6b35844d9dd36a52d0b109d367ae7f25df773bd8ff30e69e061499392", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-darwin-aarch64" + "sha256": "dc30b0276c0ba45857eef021b677d4fb2bbf13bcf809f99b691db9512bca47cc", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "23bddc8119bce6c0eeef1461bc0526291d60de9042b28780012033ba4082090e", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-ppc64le" + "sha256": "23adf27e7637fcb65b37d8a214712c4a83d1a3cbc6be0fefd7b6e5cdfd89cb79", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "c4bac574a2123938de4ef410e7cef92d079abe266298c93257cbcc4e17134184", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-riscv64" + "sha256": "392f705e6b1ad99b8bf761f4be8211d531fbacbcad1326f14f1cdcfc68c25a6b", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6c0c7d9b6119f68b3dcbf816cf9e5782eb7cea8d2433f8a51b95a41276241e18", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-s390x" + "sha256": "fe2d32c99c34c39a5156fb3bfb73949be746644a3f887b628bfc971c37fa1b90", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe" + "sha256": "5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "da13657d04c9ecfc6995617875985e2a794ca31a2f3abdac79b8df41c08b4704", - "url": "https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-aarch64.exe" + "sha256": "1d68182195b099410ad5ad19ca594e884096137e232e1fd5e2da014612f79466", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-aarch64.exe" } }, - "version": "2.32.3" + "version": "2.32.4" }, "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", "variants": [ From 4c7a6d18d9aea3620ee177b855e762f6407fd551 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 20 Jan 2025 16:04:16 -0800 Subject: [PATCH 445/667] Update 27 to buildx 0.20.0 --- 27/cli/Dockerfile | 30 +++---- 27/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- versions.json | 80 +++++++++---------- 4 files changed, 61 insertions(+), 61 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index a72bc9ed1..43d8e7e0b 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.19.3 +ENV DOCKER_BUILDX_VERSION 0.20.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-amd64'; \ - sha256='32ed111e941e385c2fb8261eba06a4056915718fd606f8278834ac1931d261a2'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-amd64'; \ + sha256='8b21d3ce1011c4c072d64d4a7311c591cf1c2eb6b35bfdfe28f8e0b76e51621b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v6'; \ - sha256='744352489292ab1439e4b4facfd49f81cbe25e71e205908bd9ec44618759739c'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm-v6'; \ + sha256='94aeb8e6d6f56a162dee85f9f88af33e93cd0c39cc60d4453998e876a4652381'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v7'; \ - sha256='5a83e1663b595147ac0225d876fc77e3b441e62dac7a59523ba7003eb6733b8b'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm-v7'; \ + sha256='eab0a7d7a2ae87593827a6267f02c9144e2e12dad1a62fc7d53b12e3f931e331'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm64'; \ - sha256='138b587399b27bb61945a36d67866177b85dea1155101a2be63c7ab715f18a2e'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm64'; \ + sha256='838f009f34da70a74cf3c835178b8686bc1e5f47509add274a6ee22f70620521'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-ppc64le'; \ - sha256='b9eb337b16a75ad45ff846134d34599169bc6dfdb168fb51303fc6b08ed9f31e'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-ppc64le'; \ + sha256='eb0a33ebb7f1353524eecc962b896307f718cf7b753b490918e0f22c087e0636'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-riscv64'; \ - sha256='de8151fe6ced7118f2d680e1d1e7c5cb00496ca0e8b0f8b261450c6636d86978'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-riscv64'; \ + sha256='ce65046624f3da234030f7f4d83f345e0879403c7980cfe6937b88ad6ecd1f36'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-s390x'; \ - sha256='422a9a0250d52dfdd6b78c8152fbf9df41993be4c7add93438c22122ff6c7da8'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-s390x'; \ + sha256='01f1ab8d3c1ffaf8b84422a820a54a296c41f6af9753a975a29f5d8918169a1a'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 53940c5a3..b26d11206 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.3 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289 +ENV DOCKER_BUILDX_VERSION 0.20.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 61123c807345d35525bc242bb182526cb0c10310eaf107bbcc97695be528c141 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 96584f848..f12dca6f3 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.19.3 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289 +ENV DOCKER_BUILDX_VERSION 0.20.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 61123c807345d35525bc242bb182526cb0c10310eaf107bbcc97695be528c141 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 3c836f063..54cff768a 100644 --- a/versions.json +++ b/versions.json @@ -22,72 +22,72 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.19.3.linux-amd64", - "sha256": "32ed111e941e385c2fb8261eba06a4056915718fd606f8278834ac1931d261a2", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-amd64" + "file": "buildx-v0.20.0.linux-amd64", + "sha256": "8b21d3ce1011c4c072d64d4a7311c591cf1c2eb6b35bfdfe28f8e0b76e51621b", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.19.3.linux-arm-v6", - "sha256": "744352489292ab1439e4b4facfd49f81cbe25e71e205908bd9ec44618759739c", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v6" + "file": "buildx-v0.20.0.linux-arm-v6", + "sha256": "94aeb8e6d6f56a162dee85f9f88af33e93cd0c39cc60d4453998e876a4652381", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.19.3.linux-arm-v7", - "sha256": "5a83e1663b595147ac0225d876fc77e3b441e62dac7a59523ba7003eb6733b8b", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm-v7" + "file": "buildx-v0.20.0.linux-arm-v7", + "sha256": "eab0a7d7a2ae87593827a6267f02c9144e2e12dad1a62fc7d53b12e3f931e331", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.19.3.linux-arm64", - "sha256": "138b587399b27bb61945a36d67866177b85dea1155101a2be63c7ab715f18a2e", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-arm64" + "file": "buildx-v0.20.0.linux-arm64", + "sha256": "838f009f34da70a74cf3c835178b8686bc1e5f47509add274a6ee22f70620521", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.19.3.freebsd-amd64", - "sha256": "dc8de077eda0f3d8d1433d790286ef7b88cb8bda01f6a83f2e6fd23d66a8e483", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.freebsd-amd64" + "file": "buildx-v0.20.0.freebsd-amd64", + "sha256": "28b5966a4caa7bccd92dfc3e0942c420b7e5ecd9ed6a167a84ba3ed088040f8a", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.19.3.freebsd-arm64", - "sha256": "e846d4f727bb6f6fccd186b1325866aa26c281361cbaa43a6760ae9af7ade1dc", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.freebsd-arm64" + "file": "buildx-v0.20.0.freebsd-arm64", + "sha256": "b219ccd0d0fd40eaadc4539954050b7466de6febe81ae7ad11982011794d1d15", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.freebsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.19.3.openbsd-amd64", - "sha256": "9cb27ed38bad3b61f4a50ea7411391aec13b278fc6af37230fdaee709706a5a2", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.openbsd-amd64" + "file": "buildx-v0.20.0.openbsd-amd64", + "sha256": "e3e77e074f4bdd3f3b5f11377e7f4af08c361d5cbec3a71efe3489c349d25416", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.19.3.openbsd-arm64", - "sha256": "d16ebd5bf33f9c98bed2019fa5fb8778ea77e3bb472737a2e23ab6737e2ea599", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.openbsd-arm64" + "file": "buildx-v0.20.0.openbsd-arm64", + "sha256": "a97f3ff5bf278e1f0e46810c5035f583f9336f98eb45b0b85ae29e36a71d594a", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.19.3.linux-ppc64le", - "sha256": "b9eb337b16a75ad45ff846134d34599169bc6dfdb168fb51303fc6b08ed9f31e", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-ppc64le" + "file": "buildx-v0.20.0.linux-ppc64le", + "sha256": "eb0a33ebb7f1353524eecc962b896307f718cf7b753b490918e0f22c087e0636", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.19.3.linux-riscv64", - "sha256": "de8151fe6ced7118f2d680e1d1e7c5cb00496ca0e8b0f8b261450c6636d86978", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-riscv64" + "file": "buildx-v0.20.0.linux-riscv64", + "sha256": "ce65046624f3da234030f7f4d83f345e0879403c7980cfe6937b88ad6ecd1f36", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.19.3.linux-s390x", - "sha256": "422a9a0250d52dfdd6b78c8152fbf9df41993be4c7add93438c22122ff6c7da8", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.linux-s390x" + "file": "buildx-v0.20.0.linux-s390x", + "sha256": "01f1ab8d3c1ffaf8b84422a820a54a296c41f6af9753a975a29f5d8918169a1a", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.19.3.windows-amd64.exe", - "sha256": "fc24c33d547764ffc67ed430f5561c4d1bcbbee73df47648668331fa1cc2f289", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-amd64.exe" + "file": "buildx-v0.20.0.windows-amd64.exe", + "sha256": "61123c807345d35525bc242bb182526cb0c10310eaf107bbcc97695be528c141", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.19.3.windows-arm64.exe", - "sha256": "f799675f89cdff20c76bc0b17953045df2cea47d09613779c4bcfd63ebee7bd9", - "url": "https://github.com/docker/buildx/releases/download/v0.19.3/buildx-v0.19.3.windows-arm64.exe" + "file": "buildx-v0.20.0.windows-arm64.exe", + "sha256": "ec0cbf810ff5fc1a20b0a973b314cd56e85c6a9454df0dd3a4c1879dab8cf427", + "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.windows-arm64.exe" } }, - "version": "0.19.3" + "version": "0.20.0" }, "compose": { "arches": { From 913a998de07135ad4e0e3042a279c31f3809635e Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Tue, 21 Jan 2025 16:38:55 -0800 Subject: [PATCH 446/667] Add Windows Server 2025 variant --- .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++++++++++++++ versions.json | 1 + versions.sh | 1 + 3 files changed, 93 insertions(+) create mode 100644 27/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/27/windows/windowsservercore-ltsc2025/Dockerfile b/27/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..853c6dfe3 --- /dev/null +++ b/27/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 27.5.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.20.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 61123c807345d35525bc242bb182526cb0c10310eaf107bbcc97695be528c141 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.32.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 54cff768a..3e0ae6c82 100644 --- a/versions.json +++ b/versions.json @@ -154,6 +154,7 @@ "cli", "dind", "dind-rootless", + "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], diff --git a/versions.sh b/versions.sh index 69a13d0df..3fe6e3141 100755 --- a/versions.sh +++ b/versions.sh @@ -282,6 +282,7 @@ for version in "${versions[@]}"; do cli \ dind \ dind-rootless \ + windows/windowsservercore-ltsc2025 \ windows/windowsservercore-ltsc2022 \ windows/windowsservercore-1809 \ ; do From 03ecb33955c16b34b7d52c7563f05c736f159875 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 Jan 2025 10:04:22 -0800 Subject: [PATCH 447/667] Update 27 to 27.5.1 --- 27/cli/Dockerfile | 10 +++++----- 27/dind-rootless/Dockerfile | 4 ++-- 27/dind/Dockerfile | 8 ++++---- 27/windows/windowsservercore-1809/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 27/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 43d8e7e0b..eebc82307 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 27.5.0 +ENV DOCKER_VERSION 27.5.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile index 30039d1d7..73bbb50c8 100644 --- a/27/dind-rootless/Dockerfile +++ b/27/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-27.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.5.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index cc3622899..67fe5fede 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index b26d11206..979ab4123 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/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 27.5.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.0.zip +ENV DOCKER_VERSION 27.5.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.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/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index f12dca6f3..aeba13ace 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/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 27.5.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.0.zip +ENV DOCKER_VERSION 27.5.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.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/27/windows/windowsservercore-ltsc2025/Dockerfile b/27/windows/windowsservercore-ltsc2025/Dockerfile index 853c6dfe3..9a19cafc4 100644 --- a/27/windows/windowsservercore-ltsc2025/Dockerfile +++ b/27/windows/windowsservercore-ltsc2025/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 27.5.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.0.zip +ENV DOCKER_VERSION 27.5.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.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/versions.json b/versions.json index 3e0ae6c82..27b45c389 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "27": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.5.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.5.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.5.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.5.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.zip" } }, "buildx": { @@ -158,7 +158,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "27.5.0" + "version": "27.5.1" }, "27-rc": null } From 9af9a06de75a33816897ae7285fcb5104c5d9f83 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 Jan 2025 16:04:17 -0800 Subject: [PATCH 448/667] Update 27 to buildx 0.20.1 --- 27/cli/Dockerfile | 30 +++---- 27/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 80 +++++++++---------- 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index eebc82307..353a13a08 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.20.0 +ENV DOCKER_BUILDX_VERSION 0.20.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-amd64'; \ - sha256='8b21d3ce1011c4c072d64d4a7311c591cf1c2eb6b35bfdfe28f8e0b76e51621b'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-amd64'; \ + sha256='8c38f60308a895fa570f1410e453c5de11aafd65a99fa99965d96d24b6225a78'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm-v6'; \ - sha256='94aeb8e6d6f56a162dee85f9f88af33e93cd0c39cc60d4453998e876a4652381'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v6'; \ + sha256='ba0929f3389db9c407c23debb7c02faaf5e1d09da48c94905f0759736a39ee2f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm-v7'; \ - sha256='eab0a7d7a2ae87593827a6267f02c9144e2e12dad1a62fc7d53b12e3f931e331'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v7'; \ + sha256='52672d1810f359685c171e85f7c96f71e32aa5f170d7841b32282a8e3ba16fce'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm64'; \ - sha256='838f009f34da70a74cf3c835178b8686bc1e5f47509add274a6ee22f70620521'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm64'; \ + sha256='f7d867e9f1a3c00b32dd580f56594e229df05e3fb1b083b7099c91c2e7d2ce1e'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-ppc64le'; \ - sha256='eb0a33ebb7f1353524eecc962b896307f718cf7b753b490918e0f22c087e0636'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-ppc64le'; \ + sha256='7bee10600a6fb9f01cecae11e92e5b5271a732e5641580037b7f74fb84c033ea'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-riscv64'; \ - sha256='ce65046624f3da234030f7f4d83f345e0879403c7980cfe6937b88ad6ecd1f36'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-riscv64'; \ + sha256='f4cf6e6a6f27e571e5210cf6324b720c10548b0a0b59e0b1381b43fde0604c65'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-s390x'; \ - sha256='01f1ab8d3c1ffaf8b84422a820a54a296c41f6af9753a975a29f5d8918169a1a'; \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-s390x'; \ + sha256='93d547dcecaeddd6fe6cc384110b532bf204126ef4ee3aa9ad9765c813a1b809'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 979ab4123..1b7c45e94 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.20.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 61123c807345d35525bc242bb182526cb0c10310eaf107bbcc97695be528c141 +ENV DOCKER_BUILDX_VERSION 0.20.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index aeba13ace..60b9f4b5c 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.20.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 61123c807345d35525bc242bb182526cb0c10310eaf107bbcc97695be528c141 +ENV DOCKER_BUILDX_VERSION 0.20.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2025/Dockerfile b/27/windows/windowsservercore-ltsc2025/Dockerfile index 9a19cafc4..338d2f409 100644 --- a/27/windows/windowsservercore-ltsc2025/Dockerfile +++ b/27/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.20.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 61123c807345d35525bc242bb182526cb0c10310eaf107bbcc97695be528c141 +ENV DOCKER_BUILDX_VERSION 0.20.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 27b45c389..ddae045d8 100644 --- a/versions.json +++ b/versions.json @@ -22,72 +22,72 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.20.0.linux-amd64", - "sha256": "8b21d3ce1011c4c072d64d4a7311c591cf1c2eb6b35bfdfe28f8e0b76e51621b", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-amd64" + "file": "buildx-v0.20.1.linux-amd64", + "sha256": "8c38f60308a895fa570f1410e453c5de11aafd65a99fa99965d96d24b6225a78", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.20.0.linux-arm-v6", - "sha256": "94aeb8e6d6f56a162dee85f9f88af33e93cd0c39cc60d4453998e876a4652381", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm-v6" + "file": "buildx-v0.20.1.linux-arm-v6", + "sha256": "ba0929f3389db9c407c23debb7c02faaf5e1d09da48c94905f0759736a39ee2f", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.20.0.linux-arm-v7", - "sha256": "eab0a7d7a2ae87593827a6267f02c9144e2e12dad1a62fc7d53b12e3f931e331", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm-v7" + "file": "buildx-v0.20.1.linux-arm-v7", + "sha256": "52672d1810f359685c171e85f7c96f71e32aa5f170d7841b32282a8e3ba16fce", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.20.0.linux-arm64", - "sha256": "838f009f34da70a74cf3c835178b8686bc1e5f47509add274a6ee22f70620521", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-arm64" + "file": "buildx-v0.20.1.linux-arm64", + "sha256": "f7d867e9f1a3c00b32dd580f56594e229df05e3fb1b083b7099c91c2e7d2ce1e", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.20.0.freebsd-amd64", - "sha256": "28b5966a4caa7bccd92dfc3e0942c420b7e5ecd9ed6a167a84ba3ed088040f8a", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.freebsd-amd64" + "file": "buildx-v0.20.1.freebsd-amd64", + "sha256": "b1e2df77781e7a9a7fdcd1c83b96e2d23faf695255be97e1e3263a3727ca8d05", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.20.0.freebsd-arm64", - "sha256": "b219ccd0d0fd40eaadc4539954050b7466de6febe81ae7ad11982011794d1d15", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.freebsd-arm64" + "file": "buildx-v0.20.1.freebsd-arm64", + "sha256": "55bf429feb475b877aab711a43a31feab369d76c50b1a418b86c342032448554", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.freebsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.20.0.openbsd-amd64", - "sha256": "e3e77e074f4bdd3f3b5f11377e7f4af08c361d5cbec3a71efe3489c349d25416", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.openbsd-amd64" + "file": "buildx-v0.20.1.openbsd-amd64", + "sha256": "88432fae9649e923118738718d2b3650861f45686f4bcbb9ff321db7ff284789", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.20.0.openbsd-arm64", - "sha256": "a97f3ff5bf278e1f0e46810c5035f583f9336f98eb45b0b85ae29e36a71d594a", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.openbsd-arm64" + "file": "buildx-v0.20.1.openbsd-arm64", + "sha256": "60c644b12464cff63c6484caa4609f7e0b177bbe0db163b6ae0782aba89854e6", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.20.0.linux-ppc64le", - "sha256": "eb0a33ebb7f1353524eecc962b896307f718cf7b753b490918e0f22c087e0636", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-ppc64le" + "file": "buildx-v0.20.1.linux-ppc64le", + "sha256": "7bee10600a6fb9f01cecae11e92e5b5271a732e5641580037b7f74fb84c033ea", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.20.0.linux-riscv64", - "sha256": "ce65046624f3da234030f7f4d83f345e0879403c7980cfe6937b88ad6ecd1f36", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-riscv64" + "file": "buildx-v0.20.1.linux-riscv64", + "sha256": "f4cf6e6a6f27e571e5210cf6324b720c10548b0a0b59e0b1381b43fde0604c65", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.20.0.linux-s390x", - "sha256": "01f1ab8d3c1ffaf8b84422a820a54a296c41f6af9753a975a29f5d8918169a1a", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.linux-s390x" + "file": "buildx-v0.20.1.linux-s390x", + "sha256": "93d547dcecaeddd6fe6cc384110b532bf204126ef4ee3aa9ad9765c813a1b809", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.20.0.windows-amd64.exe", - "sha256": "61123c807345d35525bc242bb182526cb0c10310eaf107bbcc97695be528c141", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.windows-amd64.exe" + "file": "buildx-v0.20.1.windows-amd64.exe", + "sha256": "39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.20.0.windows-arm64.exe", - "sha256": "ec0cbf810ff5fc1a20b0a973b314cd56e85c6a9454df0dd3a4c1879dab8cf427", - "url": "https://github.com/docker/buildx/releases/download/v0.20.0/buildx-v0.20.0.windows-arm64.exe" + "file": "buildx-v0.20.1.windows-arm64.exe", + "sha256": "ecb7728e38a91c712e0d5cbefbc9aebf0fefe0581136d8859b2f0e70403f87ef", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-arm64.exe" } }, - "version": "0.20.0" + "version": "0.20.1" }, "compose": { "arches": { From fbb79dd2512681b42f6f0a3a82543c29640b85ce Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Sat, 1 Feb 2025 16:04:18 -0800 Subject: [PATCH 449/667] Update 27 --- 27/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile index 67fe5fede..9436571fb 100644 --- a/27/dind/Dockerfile +++ b/27/dind/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ runc --version # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 65cfcc28ab37cb75e1560e4b4738719c07c6618e +ENV DIND_COMMIT c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index ddae045d8..723fca557 100644 --- a/versions.json +++ b/versions.json @@ -149,7 +149,7 @@ }, "version": "2.32.4" }, - "dindCommit": "65cfcc28ab37cb75e1560e4b4738719c07c6618e", + "dindCommit": "c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef", "variants": [ "cli", "dind", From b329937b7efdb0ef4a6724a461529e36770aecb6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 6 Feb 2025 20:07:01 -0800 Subject: [PATCH 450/667] Add 28.0.0-rc.1 --- 28-rc/cli/Dockerfile | 167 +++++++++++++ 28-rc/cli/docker-entrypoint.sh | 61 +++++ 28-rc/cli/modprobe.sh | 20 ++ 28-rc/dind-rootless/Dockerfile | 54 ++++ 28-rc/dind/Dockerfile | 108 ++++++++ 28-rc/dind/dockerd-entrypoint.sh | 234 ++++++++++++++++++ .../windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ Dockerfile-dind-rootless.template | 2 + versions.json | 164 +++++++++++- 11 files changed, 1082 insertions(+), 1 deletion(-) create mode 100644 28-rc/cli/Dockerfile create mode 100755 28-rc/cli/docker-entrypoint.sh create mode 100755 28-rc/cli/modprobe.sh create mode 100644 28-rc/dind-rootless/Dockerfile create mode 100644 28-rc/dind/Dockerfile create mode 100755 28-rc/dind/dockerd-entrypoint.sh create mode 100644 28-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile new file mode 100644 index 000000000..1dfccccc2 --- /dev/null +++ b/28-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.21 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 28.0.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.20.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-amd64'; \ + sha256='8c38f60308a895fa570f1410e453c5de11aafd65a99fa99965d96d24b6225a78'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v6'; \ + sha256='ba0929f3389db9c407c23debb7c02faaf5e1d09da48c94905f0759736a39ee2f'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v7'; \ + sha256='52672d1810f359685c171e85f7c96f71e32aa5f170d7841b32282a8e3ba16fce'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm64'; \ + sha256='f7d867e9f1a3c00b32dd580f56594e229df05e3fb1b083b7099c91c2e7d2ce1e'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-ppc64le'; \ + sha256='7bee10600a6fb9f01cecae11e92e5b5271a732e5641580037b7f74fb84c033ea'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-riscv64'; \ + sha256='f4cf6e6a6f27e571e5210cf6324b720c10548b0a0b59e0b1381b43fde0604c65'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-s390x'; \ + sha256='93d547dcecaeddd6fe6cc384110b532bf204126ef4ee3aa9ad9765c813a1b809'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.32.4 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64'; \ + sha256='ed1917fb54db184192ea9d0717bcd59e3662ea79db48bff36d3475516c480a6b'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv6'; \ + sha256='1e9c5c4cbdda569164a067ce9246c3a969bac253192526ffe0d0e3a99a4cbd0a'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv7'; \ + sha256='c12bb3c23db5c409a15dbb13be4b61faa74c881d5db5f8a2816f60c19c35251a'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-aarch64'; \ + sha256='0c4591cf3b1ed039adcd803dbbeddf757375fc08c11245b0154135f838495a2f'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-ppc64le'; \ + sha256='23adf27e7637fcb65b37d8a214712c4a83d1a3cbc6be0fefd7b6e5cdfd89cb79'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-riscv64'; \ + sha256='392f705e6b1ad99b8bf761f4be8211d531fbacbcad1326f14f1cdcfc68c25a6b'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-s390x'; \ + sha256='fe2d32c99c34c39a5156fb3bfb73949be746644a3f887b628bfc971c37fa1b90'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/28-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/28-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..512a05802 --- /dev/null +++ b/28-rc/dind-rootless/Dockerfile @@ -0,0 +1,54 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile new file mode 100644 index 000000000..c457b7f86 --- /dev/null +++ b/28-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..6c06bb811 --- /dev/null +++ b/28-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,234 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..ae5f346c1 --- /dev/null +++ b/28-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.20.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.32.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..e1391c2a8 --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.20.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.32.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..fd9ad9ca8 --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.20.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.32.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/Dockerfile-dind-rootless.template b/Dockerfile-dind-rootless.template index 3d9c76782..b9af45f8f 100644 --- a/Dockerfile-dind-rootless.template +++ b/Dockerfile-dind-rootless.template @@ -30,7 +30,9 @@ RUN set -eux; \ --strip-components 1 \ --directory /usr/local/bin/ \ 'docker-rootless-extras/rootlesskit' \ +{{ if env.version | rtrimstr("-rc") | IN("27") then ( -}} 'docker-rootless-extras/rootlesskit-docker-proxy' \ +{{ ) else "" end -}} 'docker-rootless-extras/vpnkit' \ ; \ rm rootless.tgz; \ diff --git a/versions.json b/versions.json index 723fca557..d4b168d87 100644 --- a/versions.json +++ b/versions.json @@ -160,5 +160,167 @@ ], "version": "27.5.1" }, - "27-rc": null + "27-rc": null, + "28": null, + "28-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.20.1.linux-amd64", + "sha256": "8c38f60308a895fa570f1410e453c5de11aafd65a99fa99965d96d24b6225a78", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.20.1.linux-arm-v6", + "sha256": "ba0929f3389db9c407c23debb7c02faaf5e1d09da48c94905f0759736a39ee2f", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.20.1.linux-arm-v7", + "sha256": "52672d1810f359685c171e85f7c96f71e32aa5f170d7841b32282a8e3ba16fce", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.20.1.linux-arm64", + "sha256": "f7d867e9f1a3c00b32dd580f56594e229df05e3fb1b083b7099c91c2e7d2ce1e", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.20.1.freebsd-amd64", + "sha256": "b1e2df77781e7a9a7fdcd1c83b96e2d23faf695255be97e1e3263a3727ca8d05", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.20.1.freebsd-arm64", + "sha256": "55bf429feb475b877aab711a43a31feab369d76c50b1a418b86c342032448554", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.freebsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.20.1.openbsd-amd64", + "sha256": "88432fae9649e923118738718d2b3650861f45686f4bcbb9ff321db7ff284789", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.20.1.openbsd-arm64", + "sha256": "60c644b12464cff63c6484caa4609f7e0b177bbe0db163b6ae0782aba89854e6", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.20.1.linux-ppc64le", + "sha256": "7bee10600a6fb9f01cecae11e92e5b5271a732e5641580037b7f74fb84c033ea", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.20.1.linux-riscv64", + "sha256": "f4cf6e6a6f27e571e5210cf6324b720c10548b0a0b59e0b1381b43fde0604c65", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.20.1.linux-s390x", + "sha256": "93d547dcecaeddd6fe6cc384110b532bf204126ef4ee3aa9ad9765c813a1b809", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.20.1.windows-amd64.exe", + "sha256": "39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.20.1.windows-arm64.exe", + "sha256": "ecb7728e38a91c712e0d5cbefbc9aebf0fefe0581136d8859b2f0e70403f87ef", + "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-arm64.exe" + } + }, + "version": "0.20.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "ed1917fb54db184192ea9d0717bcd59e3662ea79db48bff36d3475516c480a6b", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "1e9c5c4cbdda569164a067ce9246c3a969bac253192526ffe0d0e3a99a4cbd0a", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "c12bb3c23db5c409a15dbb13be4b61faa74c881d5db5f8a2816f60c19c35251a", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "0c4591cf3b1ed039adcd803dbbeddf757375fc08c11245b0154135f838495a2f", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "bd6f3b3b93032f47ad2c017e92df302651c9a649f4b533455371877eaaa76585", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "dc30b0276c0ba45857eef021b677d4fb2bbf13bcf809f99b691db9512bca47cc", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "23adf27e7637fcb65b37d8a214712c4a83d1a3cbc6be0fefd7b6e5cdfd89cb79", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "392f705e6b1ad99b8bf761f4be8211d531fbacbcad1326f14f1cdcfc68c25a6b", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "fe2d32c99c34c39a5156fb3bfb73949be746644a3f887b628bfc971c37fa1b90", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "1d68182195b099410ad5ad19ca594e884096137e232e1fd5e2da014612f79466", + "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.32.4" + }, + "dindCommit": "c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "28.0.0-rc.1" + } } From 2738fa1f226f9ca12b0202bd2267da2f0817c6ae Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 12 Feb 2025 04:04:16 -0800 Subject: [PATCH 451/667] Update 27 to compose 2.33.0 --- 27/cli/Dockerfile | 30 ++++++------ 27/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 353a13a08..85048e958 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.32.4 +ENV DOCKER_COMPOSE_VERSION 2.33.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64'; \ - sha256='ed1917fb54db184192ea9d0717bcd59e3662ea79db48bff36d3475516c480a6b'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64'; \ + sha256='6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv6'; \ - sha256='1e9c5c4cbdda569164a067ce9246c3a969bac253192526ffe0d0e3a99a4cbd0a'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6'; \ + sha256='360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv7'; \ - sha256='c12bb3c23db5c409a15dbb13be4b61faa74c881d5db5f8a2816f60c19c35251a'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7'; \ + sha256='69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-aarch64'; \ - sha256='0c4591cf3b1ed039adcd803dbbeddf757375fc08c11245b0154135f838495a2f'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64'; \ + sha256='03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-ppc64le'; \ - sha256='23adf27e7637fcb65b37d8a214712c4a83d1a3cbc6be0fefd7b6e5cdfd89cb79'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le'; \ + sha256='3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-riscv64'; \ - sha256='392f705e6b1ad99b8bf761f4be8211d531fbacbcad1326f14f1cdcfc68c25a6b'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64'; \ + sha256='dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-s390x'; \ - sha256='fe2d32c99c34c39a5156fb3bfb73949be746644a3f887b628bfc971c37fa1b90'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x'; \ + sha256='3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index 1b7c45e94..fb641c0f6 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd +ENV DOCKER_COMPOSE_VERSION 2.33.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 60b9f4b5c..7d5b2a92b 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd +ENV DOCKER_COMPOSE_VERSION 2.33.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2025/Dockerfile b/27/windows/windowsservercore-ltsc2025/Dockerfile index 338d2f409..314cdbba7 100644 --- a/27/windows/windowsservercore-ltsc2025/Dockerfile +++ b/27/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd +ENV DOCKER_COMPOSE_VERSION 2.33.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index d4b168d87..11ec1a5b4 100644 --- a/versions.json +++ b/versions.json @@ -93,61 +93,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ed1917fb54db184192ea9d0717bcd59e3662ea79db48bff36d3475516c480a6b", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64" + "sha256": "6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "1e9c5c4cbdda569164a067ce9246c3a969bac253192526ffe0d0e3a99a4cbd0a", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv6" + "sha256": "360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "c12bb3c23db5c409a15dbb13be4b61faa74c881d5db5f8a2816f60c19c35251a", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv7" + "sha256": "69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "0c4591cf3b1ed039adcd803dbbeddf757375fc08c11245b0154135f838495a2f", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-aarch64" + "sha256": "03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "bd6f3b3b93032f47ad2c017e92df302651c9a649f4b533455371877eaaa76585", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-darwin-x86_64" + "sha256": "9fcfa37c587b569090bced7534bc23484cd4fb7ee0a443d487c8626675f0b5c1", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "dc30b0276c0ba45857eef021b677d4fb2bbf13bcf809f99b691db9512bca47cc", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-darwin-aarch64" + "sha256": "4b06d9b89a2eb5784acbabe89623043a5a016a18d8d048efb61ef7b04f8796bc", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "23adf27e7637fcb65b37d8a214712c4a83d1a3cbc6be0fefd7b6e5cdfd89cb79", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-ppc64le" + "sha256": "3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "392f705e6b1ad99b8bf761f4be8211d531fbacbcad1326f14f1cdcfc68c25a6b", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-riscv64" + "sha256": "dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "fe2d32c99c34c39a5156fb3bfb73949be746644a3f887b628bfc971c37fa1b90", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-s390x" + "sha256": "3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe" + "sha256": "1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "1d68182195b099410ad5ad19ca594e884096137e232e1fd5e2da014612f79466", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-aarch64.exe" + "sha256": "6a03db6ecd49eb5a6edbeb33201beea41a88dc31560135c469587a2533cc9df0", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.32.4" + "version": "2.33.0" }, "dindCommit": "c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef", "variants": [ From e5fa4d1b38c5db7ece062ca1353ef43f390f3653 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 12 Feb 2025 04:06:19 -0800 Subject: [PATCH 452/667] Update 28-rc to compose 2.33.0 --- 28-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index 1dfccccc2..0682250a7 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.32.4 +ENV DOCKER_COMPOSE_VERSION 2.33.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64'; \ - sha256='ed1917fb54db184192ea9d0717bcd59e3662ea79db48bff36d3475516c480a6b'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64'; \ + sha256='6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv6'; \ - sha256='1e9c5c4cbdda569164a067ce9246c3a969bac253192526ffe0d0e3a99a4cbd0a'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6'; \ + sha256='360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv7'; \ - sha256='c12bb3c23db5c409a15dbb13be4b61faa74c881d5db5f8a2816f60c19c35251a'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7'; \ + sha256='69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-aarch64'; \ - sha256='0c4591cf3b1ed039adcd803dbbeddf757375fc08c11245b0154135f838495a2f'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64'; \ + sha256='03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-ppc64le'; \ - sha256='23adf27e7637fcb65b37d8a214712c4a83d1a3cbc6be0fefd7b6e5cdfd89cb79'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le'; \ + sha256='3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-riscv64'; \ - sha256='392f705e6b1ad99b8bf761f4be8211d531fbacbcad1326f14f1cdcfc68c25a6b'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64'; \ + sha256='dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-s390x'; \ - sha256='fe2d32c99c34c39a5156fb3bfb73949be746644a3f887b628bfc971c37fa1b90'; \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x'; \ + sha256='3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile index ae5f346c1..e21a10194 100644 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ b/28-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd +ENV DOCKER_COMPOSE_VERSION 2.33.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index e1391c2a8..84a881384 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd +ENV DOCKER_COMPOSE_VERSION 2.33.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index fd9ad9ca8..c6fa387db 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.32.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd +ENV DOCKER_COMPOSE_VERSION 2.33.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 11ec1a5b4..65ec8987b 100644 --- a/versions.json +++ b/versions.json @@ -256,61 +256,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "ed1917fb54db184192ea9d0717bcd59e3662ea79db48bff36d3475516c480a6b", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64" + "sha256": "6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "1e9c5c4cbdda569164a067ce9246c3a969bac253192526ffe0d0e3a99a4cbd0a", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv6" + "sha256": "360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "c12bb3c23db5c409a15dbb13be4b61faa74c881d5db5f8a2816f60c19c35251a", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv7" + "sha256": "69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "0c4591cf3b1ed039adcd803dbbeddf757375fc08c11245b0154135f838495a2f", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-aarch64" + "sha256": "03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "bd6f3b3b93032f47ad2c017e92df302651c9a649f4b533455371877eaaa76585", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-darwin-x86_64" + "sha256": "9fcfa37c587b569090bced7534bc23484cd4fb7ee0a443d487c8626675f0b5c1", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "dc30b0276c0ba45857eef021b677d4fb2bbf13bcf809f99b691db9512bca47cc", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-darwin-aarch64" + "sha256": "4b06d9b89a2eb5784acbabe89623043a5a016a18d8d048efb61ef7b04f8796bc", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "23adf27e7637fcb65b37d8a214712c4a83d1a3cbc6be0fefd7b6e5cdfd89cb79", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-ppc64le" + "sha256": "3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "392f705e6b1ad99b8bf761f4be8211d531fbacbcad1326f14f1cdcfc68c25a6b", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-riscv64" + "sha256": "dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "fe2d32c99c34c39a5156fb3bfb73949be746644a3f887b628bfc971c37fa1b90", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-s390x" + "sha256": "3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe" + "sha256": "1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "1d68182195b099410ad5ad19ca594e884096137e232e1fd5e2da014612f79466", - "url": "https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-aarch64.exe" + "sha256": "6a03db6ecd49eb5a6edbeb33201beea41a88dc31560135c469587a2533cc9df0", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.32.4" + "version": "2.33.0" }, "dindCommit": "c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef", "variants": [ From a835d8fa0def2d94f1a7509cc2ff07bdf57faf4e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Feb 2025 04:01:18 -0800 Subject: [PATCH 453/667] Update 28-rc to 28.0.0-rc.2 --- 28-rc/cli/Dockerfile | 10 +++++----- 28-rc/dind-rootless/Dockerfile | 4 ++-- 28-rc/dind/Dockerfile | 8 ++++---- 28-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- .../windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index 0682250a7..4975cee09 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.0.0-rc.1 +ENV DOCKER_VERSION 28.0.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile index 512a05802..02705c42a 100644 --- a/28-rc/dind-rootless/Dockerfile +++ b/28-rc/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/test/x86_64/docker-rootless-extras-28.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile index c457b7f86..86bb9af4e 100644 --- a/28-rc/dind/Dockerfile +++ b/28-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile index e21a10194..9719035d4 100644 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ b/28-rc/windows/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 28.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.1.zip +ENV DOCKER_VERSION 28.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.2.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/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 84a881384..139cb73f0 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/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 28.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.1.zip +ENV DOCKER_VERSION 28.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.2.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/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index c6fa387db..852262670 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/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 28.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.1.zip +ENV DOCKER_VERSION 28.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.2.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/versions.json b/versions.json index 65ec8987b..0e2b0ebf3 100644 --- a/versions.json +++ b/versions.json @@ -165,21 +165,21 @@ "28-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.2.zip" } }, "buildx": { @@ -321,6 +321,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "28.0.0-rc.1" + "version": "28.0.0-rc.2" } } From 16fe5c4f78ae9c1249533992f01a37284c4e9f0d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Feb 2025 16:04:40 -0800 Subject: [PATCH 454/667] Update 28-rc to 28.0.0-rc.3 --- 28-rc/cli/Dockerfile | 10 +++++----- 28-rc/dind-rootless/Dockerfile | 4 ++-- 28-rc/dind/Dockerfile | 8 ++++---- 28-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- .../windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index 4975cee09..918ea3738 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.0.0-rc.2 +ENV DOCKER_VERSION 28.0.0-rc.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile index 02705c42a..9838c8180 100644 --- a/28-rc/dind-rootless/Dockerfile +++ b/28-rc/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/test/x86_64/docker-rootless-extras-28.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile index 86bb9af4e..f33847d4d 100644 --- a/28-rc/dind/Dockerfile +++ b/28-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile index 9719035d4..f3be8f4df 100644 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ b/28-rc/windows/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 28.0.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.2.zip +ENV DOCKER_VERSION 28.0.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.3.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/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 139cb73f0..30672864c 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/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 28.0.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.2.zip +ENV DOCKER_VERSION 28.0.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.3.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/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index 852262670..bf7ec260b 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/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 28.0.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.2.zip +ENV DOCKER_VERSION 28.0.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.3.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/versions.json b/versions.json index 0e2b0ebf3..8ffa5d58b 100644 --- a/versions.json +++ b/versions.json @@ -165,21 +165,21 @@ "28-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.2.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.3.zip" } }, "buildx": { @@ -321,6 +321,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "28.0.0-rc.2" + "version": "28.0.0-rc.3" } } From 40a1560394eb2ccce7a34c1204ee2edc6d08829f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 19 Feb 2025 16:04:17 -0800 Subject: [PATCH 455/667] Update 27 to buildx 0.21.0 --- 27/cli/Dockerfile | 30 +++---- 27/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 80 +++++++++---------- 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile index 85048e958..bb9fd4458 100644 --- a/27/cli/Dockerfile +++ b/27/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.20.1 +ENV DOCKER_BUILDX_VERSION 0.21.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-amd64'; \ - sha256='8c38f60308a895fa570f1410e453c5de11aafd65a99fa99965d96d24b6225a78'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64'; \ + sha256='90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v6'; \ - sha256='ba0929f3389db9c407c23debb7c02faaf5e1d09da48c94905f0759736a39ee2f'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6'; \ + sha256='1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v7'; \ - sha256='52672d1810f359685c171e85f7c96f71e32aa5f170d7841b32282a8e3ba16fce'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7'; \ + sha256='542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm64'; \ - sha256='f7d867e9f1a3c00b32dd580f56594e229df05e3fb1b083b7099c91c2e7d2ce1e'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64'; \ + sha256='5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-ppc64le'; \ - sha256='7bee10600a6fb9f01cecae11e92e5b5271a732e5641580037b7f74fb84c033ea'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le'; \ + sha256='90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-riscv64'; \ - sha256='f4cf6e6a6f27e571e5210cf6324b720c10548b0a0b59e0b1381b43fde0604c65'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64'; \ + sha256='84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-s390x'; \ - sha256='93d547dcecaeddd6fe6cc384110b532bf204126ef4ee3aa9ad9765c813a1b809'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x'; \ + sha256='541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile index fb641c0f6..9777beac1 100644 --- a/27/windows/windowsservercore-1809/Dockerfile +++ b/27/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.20.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 +ENV DOCKER_BUILDX_VERSION 0.21.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index 7d5b2a92b..c0c630abe 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.20.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 +ENV DOCKER_BUILDX_VERSION 0.21.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/27/windows/windowsservercore-ltsc2025/Dockerfile b/27/windows/windowsservercore-ltsc2025/Dockerfile index 314cdbba7..a58175f8b 100644 --- a/27/windows/windowsservercore-ltsc2025/Dockerfile +++ b/27/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.20.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 +ENV DOCKER_BUILDX_VERSION 0.21.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 8ffa5d58b..f5fd408fb 100644 --- a/versions.json +++ b/versions.json @@ -22,72 +22,72 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.20.1.linux-amd64", - "sha256": "8c38f60308a895fa570f1410e453c5de11aafd65a99fa99965d96d24b6225a78", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-amd64" + "file": "buildx-v0.21.0.linux-amd64", + "sha256": "90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.20.1.linux-arm-v6", - "sha256": "ba0929f3389db9c407c23debb7c02faaf5e1d09da48c94905f0759736a39ee2f", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v6" + "file": "buildx-v0.21.0.linux-arm-v6", + "sha256": "1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.20.1.linux-arm-v7", - "sha256": "52672d1810f359685c171e85f7c96f71e32aa5f170d7841b32282a8e3ba16fce", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v7" + "file": "buildx-v0.21.0.linux-arm-v7", + "sha256": "542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.20.1.linux-arm64", - "sha256": "f7d867e9f1a3c00b32dd580f56594e229df05e3fb1b083b7099c91c2e7d2ce1e", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm64" + "file": "buildx-v0.21.0.linux-arm64", + "sha256": "5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.20.1.freebsd-amd64", - "sha256": "b1e2df77781e7a9a7fdcd1c83b96e2d23faf695255be97e1e3263a3727ca8d05", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.freebsd-amd64" + "file": "buildx-v0.21.0.freebsd-amd64", + "sha256": "3b676d7471cfdf8f1dd3ffd305ce5945ae8aa3be8a66325611dcc3a62e03b6e9", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.20.1.freebsd-arm64", - "sha256": "55bf429feb475b877aab711a43a31feab369d76c50b1a418b86c342032448554", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.freebsd-arm64" + "file": "buildx-v0.21.0.freebsd-arm64", + "sha256": "8b1b525da49e6d421039f2c3e77fdb5deaa5b55b47f523add4432c3753a067b2", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.20.1.openbsd-amd64", - "sha256": "88432fae9649e923118738718d2b3650861f45686f4bcbb9ff321db7ff284789", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.openbsd-amd64" + "file": "buildx-v0.21.0.openbsd-amd64", + "sha256": "a58c17b70a7b45a9e3e28485b165891ec3512b7e9f088d0795f0313f4ee000b8", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.20.1.openbsd-arm64", - "sha256": "60c644b12464cff63c6484caa4609f7e0b177bbe0db163b6ae0782aba89854e6", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.openbsd-arm64" + "file": "buildx-v0.21.0.openbsd-arm64", + "sha256": "de08aad4819ffb5a5395f443d5a3183497817257ac129fc5de44f0a07b62f37b", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.20.1.linux-ppc64le", - "sha256": "7bee10600a6fb9f01cecae11e92e5b5271a732e5641580037b7f74fb84c033ea", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-ppc64le" + "file": "buildx-v0.21.0.linux-ppc64le", + "sha256": "90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.20.1.linux-riscv64", - "sha256": "f4cf6e6a6f27e571e5210cf6324b720c10548b0a0b59e0b1381b43fde0604c65", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-riscv64" + "file": "buildx-v0.21.0.linux-riscv64", + "sha256": "84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.20.1.linux-s390x", - "sha256": "93d547dcecaeddd6fe6cc384110b532bf204126ef4ee3aa9ad9765c813a1b809", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-s390x" + "file": "buildx-v0.21.0.linux-s390x", + "sha256": "541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.20.1.windows-amd64.exe", - "sha256": "39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe" + "file": "buildx-v0.21.0.windows-amd64.exe", + "sha256": "a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.20.1.windows-arm64.exe", - "sha256": "ecb7728e38a91c712e0d5cbefbc9aebf0fefe0581136d8859b2f0e70403f87ef", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-arm64.exe" + "file": "buildx-v0.21.0.windows-arm64.exe", + "sha256": "b24940d6984d7e1c07875503e482047dc8698e9252e54f0e7fca75208745178b", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-arm64.exe" } }, - "version": "0.20.1" + "version": "0.21.0" }, "compose": { "arches": { From 6b0b62417fb9394960ce8591994a3cf29d303cb8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 19 Feb 2025 16:06:26 -0800 Subject: [PATCH 456/667] Update 28-rc to buildx 0.21.0 --- 28-rc/cli/Dockerfile | 30 +++---- .../windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 80 +++++++++---------- 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index 918ea3738..244a5a51a 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.20.1 +ENV DOCKER_BUILDX_VERSION 0.21.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-amd64'; \ - sha256='8c38f60308a895fa570f1410e453c5de11aafd65a99fa99965d96d24b6225a78'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64'; \ + sha256='90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v6'; \ - sha256='ba0929f3389db9c407c23debb7c02faaf5e1d09da48c94905f0759736a39ee2f'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6'; \ + sha256='1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v7'; \ - sha256='52672d1810f359685c171e85f7c96f71e32aa5f170d7841b32282a8e3ba16fce'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7'; \ + sha256='542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm64'; \ - sha256='f7d867e9f1a3c00b32dd580f56594e229df05e3fb1b083b7099c91c2e7d2ce1e'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64'; \ + sha256='5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-ppc64le'; \ - sha256='7bee10600a6fb9f01cecae11e92e5b5271a732e5641580037b7f74fb84c033ea'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le'; \ + sha256='90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-riscv64'; \ - sha256='f4cf6e6a6f27e571e5210cf6324b720c10548b0a0b59e0b1381b43fde0604c65'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64'; \ + sha256='84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-s390x'; \ - sha256='93d547dcecaeddd6fe6cc384110b532bf204126ef4ee3aa9ad9765c813a1b809'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x'; \ + sha256='541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile index f3be8f4df..6d885df87 100644 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ b/28-rc/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.20.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 +ENV DOCKER_BUILDX_VERSION 0.21.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 30672864c..e3f5f0a1e 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.20.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 +ENV DOCKER_BUILDX_VERSION 0.21.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index bf7ec260b..a3561abcd 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.20.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2 +ENV DOCKER_BUILDX_VERSION 0.21.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f5fd408fb..8f1024958 100644 --- a/versions.json +++ b/versions.json @@ -185,72 +185,72 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.20.1.linux-amd64", - "sha256": "8c38f60308a895fa570f1410e453c5de11aafd65a99fa99965d96d24b6225a78", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-amd64" + "file": "buildx-v0.21.0.linux-amd64", + "sha256": "90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.20.1.linux-arm-v6", - "sha256": "ba0929f3389db9c407c23debb7c02faaf5e1d09da48c94905f0759736a39ee2f", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v6" + "file": "buildx-v0.21.0.linux-arm-v6", + "sha256": "1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.20.1.linux-arm-v7", - "sha256": "52672d1810f359685c171e85f7c96f71e32aa5f170d7841b32282a8e3ba16fce", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v7" + "file": "buildx-v0.21.0.linux-arm-v7", + "sha256": "542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.20.1.linux-arm64", - "sha256": "f7d867e9f1a3c00b32dd580f56594e229df05e3fb1b083b7099c91c2e7d2ce1e", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm64" + "file": "buildx-v0.21.0.linux-arm64", + "sha256": "5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.20.1.freebsd-amd64", - "sha256": "b1e2df77781e7a9a7fdcd1c83b96e2d23faf695255be97e1e3263a3727ca8d05", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.freebsd-amd64" + "file": "buildx-v0.21.0.freebsd-amd64", + "sha256": "3b676d7471cfdf8f1dd3ffd305ce5945ae8aa3be8a66325611dcc3a62e03b6e9", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.20.1.freebsd-arm64", - "sha256": "55bf429feb475b877aab711a43a31feab369d76c50b1a418b86c342032448554", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.freebsd-arm64" + "file": "buildx-v0.21.0.freebsd-arm64", + "sha256": "8b1b525da49e6d421039f2c3e77fdb5deaa5b55b47f523add4432c3753a067b2", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.20.1.openbsd-amd64", - "sha256": "88432fae9649e923118738718d2b3650861f45686f4bcbb9ff321db7ff284789", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.openbsd-amd64" + "file": "buildx-v0.21.0.openbsd-amd64", + "sha256": "a58c17b70a7b45a9e3e28485b165891ec3512b7e9f088d0795f0313f4ee000b8", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.20.1.openbsd-arm64", - "sha256": "60c644b12464cff63c6484caa4609f7e0b177bbe0db163b6ae0782aba89854e6", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.openbsd-arm64" + "file": "buildx-v0.21.0.openbsd-arm64", + "sha256": "de08aad4819ffb5a5395f443d5a3183497817257ac129fc5de44f0a07b62f37b", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.20.1.linux-ppc64le", - "sha256": "7bee10600a6fb9f01cecae11e92e5b5271a732e5641580037b7f74fb84c033ea", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-ppc64le" + "file": "buildx-v0.21.0.linux-ppc64le", + "sha256": "90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.20.1.linux-riscv64", - "sha256": "f4cf6e6a6f27e571e5210cf6324b720c10548b0a0b59e0b1381b43fde0604c65", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-riscv64" + "file": "buildx-v0.21.0.linux-riscv64", + "sha256": "84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.20.1.linux-s390x", - "sha256": "93d547dcecaeddd6fe6cc384110b532bf204126ef4ee3aa9ad9765c813a1b809", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-s390x" + "file": "buildx-v0.21.0.linux-s390x", + "sha256": "541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.20.1.windows-amd64.exe", - "sha256": "39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe" + "file": "buildx-v0.21.0.windows-amd64.exe", + "sha256": "a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.20.1.windows-arm64.exe", - "sha256": "ecb7728e38a91c712e0d5cbefbc9aebf0fefe0581136d8859b2f0e70403f87ef", - "url": "https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-arm64.exe" + "file": "buildx-v0.21.0.windows-arm64.exe", + "sha256": "b24940d6984d7e1c07875503e482047dc8698e9252e54f0e7fca75208745178b", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-arm64.exe" } }, - "version": "0.20.1" + "version": "0.21.0" }, "compose": { "arches": { From 35c016d0c0f0be4dc523bc1108d7fa2681db8306 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 19 Feb 2025 22:04:43 -0800 Subject: [PATCH 457/667] Update 28 to 28.0.0, buildx 0.21.0, compose 2.33.0 --- 28/cli/Dockerfile | 167 +++++++++++++ 28/cli/docker-entrypoint.sh | 61 +++++ 28/cli/modprobe.sh | 20 ++ 28/dind-rootless/Dockerfile | 54 ++++ 28/dind/Dockerfile | 108 ++++++++ 28/dind/dockerd-entrypoint.sh | 234 ++++++++++++++++++ 28/windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 162 +++++++++++- 10 files changed, 1078 insertions(+), 1 deletion(-) create mode 100644 28/cli/Dockerfile create mode 100755 28/cli/docker-entrypoint.sh create mode 100755 28/cli/modprobe.sh create mode 100644 28/dind-rootless/Dockerfile create mode 100644 28/dind/Dockerfile create mode 100755 28/dind/dockerd-entrypoint.sh create mode 100644 28/windows/windowsservercore-1809/Dockerfile create mode 100644 28/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 28/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile new file mode 100644 index 000000000..204400090 --- /dev/null +++ b/28/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.21 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 28.0.0 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.0.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.21.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64'; \ + sha256='90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6'; \ + sha256='1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7'; \ + sha256='542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64'; \ + sha256='5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le'; \ + sha256='90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64'; \ + sha256='84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x'; \ + sha256='541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.33.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64'; \ + sha256='6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6'; \ + sha256='360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7'; \ + sha256='69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64'; \ + sha256='03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le'; \ + sha256='3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64'; \ + sha256='dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x'; \ + sha256='3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/28/cli/docker-entrypoint.sh b/28/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/28/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/28/cli/modprobe.sh b/28/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/28/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile new file mode 100644 index 000000000..011fad0e6 --- /dev/null +++ b/28/dind-rootless/Dockerfile @@ -0,0 +1,54 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +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-28.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile new file mode 100644 index 000000000..59404fa18 --- /dev/null +++ b/28/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.0.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:28-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/28/dind/dockerd-entrypoint.sh b/28/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..6c06bb811 --- /dev/null +++ b/28/dind/dockerd-entrypoint.sh @@ -0,0 +1,234 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..4d1a6f88a --- /dev/null +++ b/28/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.21.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.33.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..38f43b5e0 --- /dev/null +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.21.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.33.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..f5a76b3e4 --- /dev/null +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.21.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.33.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 8f1024958..5632c1fa1 100644 --- a/versions.json +++ b/versions.json @@ -161,7 +161,167 @@ "version": "27.5.1" }, "27-rc": null, - "28": null, + "28": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.0.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.0.0.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.0.0.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.0.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.0.0.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.21.0.linux-amd64", + "sha256": "90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.21.0.linux-arm-v6", + "sha256": "1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.21.0.linux-arm-v7", + "sha256": "542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.21.0.linux-arm64", + "sha256": "5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.21.0.freebsd-amd64", + "sha256": "3b676d7471cfdf8f1dd3ffd305ce5945ae8aa3be8a66325611dcc3a62e03b6e9", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.21.0.freebsd-arm64", + "sha256": "8b1b525da49e6d421039f2c3e77fdb5deaa5b55b47f523add4432c3753a067b2", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.21.0.openbsd-amd64", + "sha256": "a58c17b70a7b45a9e3e28485b165891ec3512b7e9f088d0795f0313f4ee000b8", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.21.0.openbsd-arm64", + "sha256": "de08aad4819ffb5a5395f443d5a3183497817257ac129fc5de44f0a07b62f37b", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.21.0.linux-ppc64le", + "sha256": "90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.21.0.linux-riscv64", + "sha256": "84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.21.0.linux-s390x", + "sha256": "541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.21.0.windows-amd64.exe", + "sha256": "a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.21.0.windows-arm64.exe", + "sha256": "b24940d6984d7e1c07875503e482047dc8698e9252e54f0e7fca75208745178b", + "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-arm64.exe" + } + }, + "version": "0.21.0" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "9fcfa37c587b569090bced7534bc23484cd4fb7ee0a443d487c8626675f0b5c1", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "4b06d9b89a2eb5784acbabe89623043a5a016a18d8d048efb61ef7b04f8796bc", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "6a03db6ecd49eb5a6edbeb33201beea41a88dc31560135c469587a2533cc9df0", + "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.33.0" + }, + "dindCommit": "c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "28.0.0" + }, "28-rc": { "arches": { "amd64": { From 3e8d8decef166523d5440e8dfb546af7542ce84f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 19 Feb 2025 22:06:50 -0800 Subject: [PATCH 458/667] Update 28-rc --- 28-rc/cli/Dockerfile | 167 ------------- 28-rc/cli/docker-entrypoint.sh | 61 ----- 28-rc/cli/modprobe.sh | 20 -- 28-rc/dind-rootless/Dockerfile | 54 ---- 28-rc/dind/Dockerfile | 108 -------- 28-rc/dind/dockerd-entrypoint.sh | 234 ------------------ .../windows/windowsservercore-1809/Dockerfile | 91 ------- .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 162 +----------- 10 files changed, 1 insertion(+), 1078 deletions(-) delete mode 100644 28-rc/cli/Dockerfile delete mode 100755 28-rc/cli/docker-entrypoint.sh delete mode 100755 28-rc/cli/modprobe.sh delete mode 100644 28-rc/dind-rootless/Dockerfile delete mode 100644 28-rc/dind/Dockerfile delete mode 100755 28-rc/dind/dockerd-entrypoint.sh delete mode 100644 28-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile deleted file mode 100644 index 244a5a51a..000000000 --- a/28-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.21 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 28.0.0-rc.3 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.3.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.3.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.21.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64'; \ - sha256='90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6'; \ - sha256='1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7'; \ - sha256='542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64'; \ - sha256='5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le'; \ - sha256='90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64'; \ - sha256='84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x'; \ - sha256='541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.33.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64'; \ - sha256='6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6'; \ - sha256='360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7'; \ - sha256='69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64'; \ - sha256='03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le'; \ - sha256='3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64'; \ - sha256='dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x'; \ - sha256='3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/28-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/28-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile deleted file mode 100644 index 9838c8180..000000000 --- a/28-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile deleted file mode 100644 index f33847d4d..000000000 --- a/28-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.3.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.3.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 6c06bb811..000000000 --- a/28-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 6d885df87..000000000 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.0.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.3.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index e3f5f0a1e..000000000 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.0.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.3.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index a3561abcd..000000000 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.0.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.3.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 5632c1fa1..f705e0e91 100644 --- a/versions.json +++ b/versions.json @@ -322,165 +322,5 @@ ], "version": "28.0.0" }, - "28-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.3.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.3.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.3.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.3.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.3.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.21.0.linux-amd64", - "sha256": "90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.21.0.linux-arm-v6", - "sha256": "1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.21.0.linux-arm-v7", - "sha256": "542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.21.0.linux-arm64", - "sha256": "5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.21.0.freebsd-amd64", - "sha256": "3b676d7471cfdf8f1dd3ffd305ce5945ae8aa3be8a66325611dcc3a62e03b6e9", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.21.0.freebsd-arm64", - "sha256": "8b1b525da49e6d421039f2c3e77fdb5deaa5b55b47f523add4432c3753a067b2", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.21.0.openbsd-amd64", - "sha256": "a58c17b70a7b45a9e3e28485b165891ec3512b7e9f088d0795f0313f4ee000b8", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.21.0.openbsd-arm64", - "sha256": "de08aad4819ffb5a5395f443d5a3183497817257ac129fc5de44f0a07b62f37b", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.21.0.linux-ppc64le", - "sha256": "90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.21.0.linux-riscv64", - "sha256": "84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.21.0.linux-s390x", - "sha256": "541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.21.0.windows-amd64.exe", - "sha256": "a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.21.0.windows-arm64.exe", - "sha256": "b24940d6984d7e1c07875503e482047dc8698e9252e54f0e7fca75208745178b", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-arm64.exe" - } - }, - "version": "0.21.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "9fcfa37c587b569090bced7534bc23484cd4fb7ee0a443d487c8626675f0b5c1", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "4b06d9b89a2eb5784acbabe89623043a5a016a18d8d048efb61ef7b04f8796bc", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "6a03db6ecd49eb5a6edbeb33201beea41a88dc31560135c469587a2533cc9df0", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.33.0" - }, - "dindCommit": "c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "28.0.0-rc.3" - } + "28-rc": null } From 26c9e5f23fb6dfe12c84473fc241c645092dc4bb Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 19 Feb 2025 20:43:13 -0800 Subject: [PATCH 459/667] Drop 27.x (now EOL) --- 27/cli/Dockerfile | 167 ------------- 27/cli/docker-entrypoint.sh | 61 ----- 27/cli/modprobe.sh | 20 -- 27/dind-rootless/Dockerfile | 55 ---- 27/dind/Dockerfile | 108 -------- 27/dind/dockerd-entrypoint.sh | 234 ------------------ 27/windows/windowsservercore-1809/Dockerfile | 91 ------- .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- Dockerfile-dind-rootless.template | 3 - versions.json | 162 ------------ 11 files changed, 1083 deletions(-) delete mode 100644 27/cli/Dockerfile delete mode 100755 27/cli/docker-entrypoint.sh delete mode 100755 27/cli/modprobe.sh delete mode 100644 27/dind-rootless/Dockerfile delete mode 100644 27/dind/Dockerfile delete mode 100755 27/dind/dockerd-entrypoint.sh delete mode 100644 27/windows/windowsservercore-1809/Dockerfile delete mode 100644 27/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 27/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/27/cli/Dockerfile b/27/cli/Dockerfile deleted file mode 100644 index bb9fd4458..000000000 --- a/27/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.21 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 27.5.1 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.21.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64'; \ - sha256='90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6'; \ - sha256='1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7'; \ - sha256='542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64'; \ - sha256='5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le'; \ - sha256='90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64'; \ - sha256='84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x'; \ - sha256='541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.33.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64'; \ - sha256='6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6'; \ - sha256='360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7'; \ - sha256='69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64'; \ - sha256='03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le'; \ - sha256='3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64'; \ - sha256='dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x'; \ - sha256='3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/27/cli/docker-entrypoint.sh b/27/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/27/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/27/cli/modprobe.sh b/27/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/27/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/27/dind-rootless/Dockerfile b/27/dind-rootless/Dockerfile deleted file mode 100644 index 73bbb50c8..000000000 --- a/27/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -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-27.5.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/rootlesskit-docker-proxy' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/27/dind/Dockerfile b/27/dind/Dockerfile deleted file mode 100644 index 9436571fb..000000000 --- a/27/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:27-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:27-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/27/dind/dockerd-entrypoint.sh b/27/dind/dockerd-entrypoint.sh deleted file mode 100755 index 6c06bb811..000000000 --- a/27/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/27/windows/windowsservercore-1809/Dockerfile b/27/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 9777beac1..000000000 --- a/27/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.5.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index c0c630abe..000000000 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.5.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/27/windows/windowsservercore-ltsc2025/Dockerfile b/27/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index a58175f8b..000000000 --- a/27/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 27.5.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/Dockerfile-dind-rootless.template b/Dockerfile-dind-rootless.template index b9af45f8f..8668b343a 100644 --- a/Dockerfile-dind-rootless.template +++ b/Dockerfile-dind-rootless.template @@ -30,9 +30,6 @@ RUN set -eux; \ --strip-components 1 \ --directory /usr/local/bin/ \ 'docker-rootless-extras/rootlesskit' \ -{{ if env.version | rtrimstr("-rc") | IN("27") then ( -}} - 'docker-rootless-extras/rootlesskit-docker-proxy' \ -{{ ) else "" end -}} 'docker-rootless-extras/vpnkit' \ ; \ rm rootless.tgz; \ diff --git a/versions.json b/versions.json index f705e0e91..6e56724fb 100644 --- a/versions.json +++ b/versions.json @@ -1,166 +1,4 @@ { - "27": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.5.1.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.1.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.21.0.linux-amd64", - "sha256": "90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.21.0.linux-arm-v6", - "sha256": "1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.21.0.linux-arm-v7", - "sha256": "542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.21.0.linux-arm64", - "sha256": "5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.21.0.freebsd-amd64", - "sha256": "3b676d7471cfdf8f1dd3ffd305ce5945ae8aa3be8a66325611dcc3a62e03b6e9", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.21.0.freebsd-arm64", - "sha256": "8b1b525da49e6d421039f2c3e77fdb5deaa5b55b47f523add4432c3753a067b2", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.21.0.openbsd-amd64", - "sha256": "a58c17b70a7b45a9e3e28485b165891ec3512b7e9f088d0795f0313f4ee000b8", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.21.0.openbsd-arm64", - "sha256": "de08aad4819ffb5a5395f443d5a3183497817257ac129fc5de44f0a07b62f37b", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.21.0.linux-ppc64le", - "sha256": "90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.21.0.linux-riscv64", - "sha256": "84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.21.0.linux-s390x", - "sha256": "541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.21.0.windows-amd64.exe", - "sha256": "a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.21.0.windows-arm64.exe", - "sha256": "b24940d6984d7e1c07875503e482047dc8698e9252e54f0e7fca75208745178b", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-arm64.exe" - } - }, - "version": "0.21.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "9fcfa37c587b569090bced7534bc23484cd4fb7ee0a443d487c8626675f0b5c1", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "4b06d9b89a2eb5784acbabe89623043a5a016a18d8d048efb61ef7b04f8796bc", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "6a03db6ecd49eb5a6edbeb33201beea41a88dc31560135c469587a2533cc9df0", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.33.0" - }, - "dindCommit": "c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "27.5.1" - }, - "27-rc": null, "28": { "arches": { "amd64": { From c9e1447b8f26065eb1dccb70ab88e62ee6c2085d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 21 Feb 2025 10:04:16 -0800 Subject: [PATCH 460/667] Update 28 to buildx 0.21.1, compose 2.33.1 --- 28/cli/Dockerfile | 60 ++++----- 28/windows/windowsservercore-1809/Dockerfile | 12 +- .../windowsservercore-ltsc2022/Dockerfile | 12 +- .../windowsservercore-ltsc2025/Dockerfile | 12 +- versions.json | 126 +++++++++--------- 5 files changed, 111 insertions(+), 111 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 204400090..9e867a202 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.21.0 +ENV DOCKER_BUILDX_VERSION 0.21.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64'; \ - sha256='90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-amd64'; \ + sha256='7f355525bfaf411302570b705118181b720f18071f4be3f0eaac7b2297d826e2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6'; \ - sha256='1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm-v6'; \ + sha256='f841251fd67646e8b6bb4c7e0c2c385f6a1dc7403f5ac6ee7b07c96f0815f7f3'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7'; \ - sha256='542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm-v7'; \ + sha256='81d7040e90e9b69cb0378778f673e1fc2a24ef6dbd47931dc83ab6472fc5809d'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64'; \ - sha256='5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm64'; \ + sha256='42d5cee287ec7426de5252276a05f3ea565ac2d65d62d052b885a84dd54152d5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le'; \ - sha256='90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-ppc64le'; \ + sha256='6a4e6a243f83d80cd46c939f327b2e14cfddd2c6690651cf48d0e208c3345b88'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64'; \ - sha256='84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-riscv64'; \ + sha256='eae82aec74a420c3d1734123e6a3bc10b3a2a981aa1d538502373e31c91bf76e'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x'; \ - sha256='541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-s390x'; \ + sha256='97b112b3366a471cc375e0f881d65a9a7b07f0962f308834c37f5c3fa75aad08'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.33.0 +ENV DOCKER_COMPOSE_VERSION 2.33.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64'; \ - sha256='6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee'; \ + url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-x86_64'; \ + sha256='3efda1ad6caed49dedd5644cadbf7e0c9cc3d74d8844ca5237b6a43ac1ef1a46'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6'; \ - sha256='360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada'; \ + url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-armv6'; \ + sha256='17e66154ed90d43d4c26dec4a77caeaa6f0a8337f436cc4bffecbc2fd9bcd27d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7'; \ - sha256='69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077'; \ + url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-armv7'; \ + sha256='0104e689d29597352a715f7027205d7517f17f449ffe14099aa9d5d0a54f7073'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64'; \ - sha256='03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818'; \ + url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-aarch64'; \ + sha256='fa0e077510c852237b0da426d0daf6853446e7760145ce7665ec401892a4d0de'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le'; \ - sha256='3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023'; \ + url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-ppc64le'; \ + sha256='79d874b04c972475867e2e1f69febdadc446289af32afaa0dcb99f48a25380cc'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64'; \ - sha256='dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3'; \ + url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-riscv64'; \ + sha256='8a51f33cb82afc6b7ce1c02b3161ce928387e96efa7b838e2f9f1fa554d68781'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x'; \ - sha256='3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb'; \ + url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-s390x'; \ + sha256='bae7fd067dd05951e4c6cb66199d2e7f388b5c19856db760fe4253dfdf2a008e'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 4d1a6f88a..547a05fc2 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d +ENV DOCKER_BUILDX_VERSION 0.21.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ab3eba3acbfa6b6612690af075795254f29762efc8abace5f636b8e7628b1851 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 +ENV DOCKER_COMPOSE_VERSION 2.33.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 01bce3456228d8e1e4b0ba056f4b9730b7fd2c1a7113c8a985144c0fdee797b0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 38f43b5e0..8c2ab4764 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d +ENV DOCKER_BUILDX_VERSION 0.21.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ab3eba3acbfa6b6612690af075795254f29762efc8abace5f636b8e7628b1851 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 +ENV DOCKER_COMPOSE_VERSION 2.33.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 01bce3456228d8e1e4b0ba056f4b9730b7fd2c1a7113c8a985144c0fdee797b0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index f5a76b3e4..ce76da38e 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d +ENV DOCKER_BUILDX_VERSION 0.21.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ab3eba3acbfa6b6612690af075795254f29762efc8abace5f636b8e7628b1851 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83 +ENV DOCKER_COMPOSE_VERSION 2.33.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 01bce3456228d8e1e4b0ba056f4b9730b7fd2c1a7113c8a985144c0fdee797b0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6e56724fb..152c4552a 100644 --- a/versions.json +++ b/versions.json @@ -22,132 +22,132 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.21.0.linux-amd64", - "sha256": "90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64" + "file": "buildx-v0.21.1.linux-amd64", + "sha256": "7f355525bfaf411302570b705118181b720f18071f4be3f0eaac7b2297d826e2", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.21.0.linux-arm-v6", - "sha256": "1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6" + "file": "buildx-v0.21.1.linux-arm-v6", + "sha256": "f841251fd67646e8b6bb4c7e0c2c385f6a1dc7403f5ac6ee7b07c96f0815f7f3", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.21.0.linux-arm-v7", - "sha256": "542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7" + "file": "buildx-v0.21.1.linux-arm-v7", + "sha256": "81d7040e90e9b69cb0378778f673e1fc2a24ef6dbd47931dc83ab6472fc5809d", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.21.0.linux-arm64", - "sha256": "5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64" + "file": "buildx-v0.21.1.linux-arm64", + "sha256": "42d5cee287ec7426de5252276a05f3ea565ac2d65d62d052b885a84dd54152d5", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.21.0.freebsd-amd64", - "sha256": "3b676d7471cfdf8f1dd3ffd305ce5945ae8aa3be8a66325611dcc3a62e03b6e9", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-amd64" + "file": "buildx-v0.21.1.freebsd-amd64", + "sha256": "4353da82953f9e26dd0d76cc64efb27a9564aed92065b5e8144b52dadcf603ae", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.21.0.freebsd-arm64", - "sha256": "8b1b525da49e6d421039f2c3e77fdb5deaa5b55b47f523add4432c3753a067b2", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.freebsd-arm64" + "file": "buildx-v0.21.1.freebsd-arm64", + "sha256": "241c204f3e10636d64e4eb966f30ab63468fb3b80b9777697df44d6f42d8a828", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.freebsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.21.0.openbsd-amd64", - "sha256": "a58c17b70a7b45a9e3e28485b165891ec3512b7e9f088d0795f0313f4ee000b8", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-amd64" + "file": "buildx-v0.21.1.openbsd-amd64", + "sha256": "db22ce7c5d2f28a1d40f6892ba6e783b065fd27ff14c507b8ec4ed6a5cca442d", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.21.0.openbsd-arm64", - "sha256": "de08aad4819ffb5a5395f443d5a3183497817257ac129fc5de44f0a07b62f37b", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.openbsd-arm64" + "file": "buildx-v0.21.1.openbsd-arm64", + "sha256": "f691a9760ee5fa9da0856d35d12d71216828164eb94e4bbf93d1b706fa76c7c2", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.21.0.linux-ppc64le", - "sha256": "90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le" + "file": "buildx-v0.21.1.linux-ppc64le", + "sha256": "6a4e6a243f83d80cd46c939f327b2e14cfddd2c6690651cf48d0e208c3345b88", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.21.0.linux-riscv64", - "sha256": "84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64" + "file": "buildx-v0.21.1.linux-riscv64", + "sha256": "eae82aec74a420c3d1734123e6a3bc10b3a2a981aa1d538502373e31c91bf76e", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.21.0.linux-s390x", - "sha256": "541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x" + "file": "buildx-v0.21.1.linux-s390x", + "sha256": "97b112b3366a471cc375e0f881d65a9a7b07f0962f308834c37f5c3fa75aad08", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.21.0.windows-amd64.exe", - "sha256": "a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe" + "file": "buildx-v0.21.1.windows-amd64.exe", + "sha256": "ab3eba3acbfa6b6612690af075795254f29762efc8abace5f636b8e7628b1851", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.21.0.windows-arm64.exe", - "sha256": "b24940d6984d7e1c07875503e482047dc8698e9252e54f0e7fca75208745178b", - "url": "https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-arm64.exe" + "file": "buildx-v0.21.1.windows-arm64.exe", + "sha256": "b46c97208860b6fb83e9c69ac01379a1991b1c428a0b89def443fc1972f7b3cd", + "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-arm64.exe" } }, - "version": "0.21.0" + "version": "0.21.1" }, "compose": { "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64" + "sha256": "3efda1ad6caed49dedd5644cadbf7e0c9cc3d74d8844ca5237b6a43ac1ef1a46", + "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6" + "sha256": "17e66154ed90d43d4c26dec4a77caeaa6f0a8337f436cc4bffecbc2fd9bcd27d", + "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7" + "sha256": "0104e689d29597352a715f7027205d7517f17f449ffe14099aa9d5d0a54f7073", + "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64" + "sha256": "fa0e077510c852237b0da426d0daf6853446e7760145ce7665ec401892a4d0de", + "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "9fcfa37c587b569090bced7534bc23484cd4fb7ee0a443d487c8626675f0b5c1", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-x86_64" + "sha256": "17c05c6a42cab2302efed50e837aac099a52b10f9fc90dab04929496449b22ef", + "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "4b06d9b89a2eb5784acbabe89623043a5a016a18d8d048efb61ef7b04f8796bc", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-darwin-aarch64" + "sha256": "0577710624554abe3c357be069205321751f8d429d75f93de993be0de2e27107", + "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le" + "sha256": "79d874b04c972475867e2e1f69febdadc446289af32afaa0dcb99f48a25380cc", + "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64" + "sha256": "8a51f33cb82afc6b7ce1c02b3161ce928387e96efa7b838e2f9f1fa554d68781", + "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x" + "sha256": "bae7fd067dd05951e4c6cb66199d2e7f388b5c19856db760fe4253dfdf2a008e", + "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe" + "sha256": "01bce3456228d8e1e4b0ba056f4b9730b7fd2c1a7113c8a985144c0fdee797b0", + "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "6a03db6ecd49eb5a6edbeb33201beea41a88dc31560135c469587a2533cc9df0", - "url": "https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-aarch64.exe" + "sha256": "bc9d23c97520cc7c3af0479b02c7155bf538891eb150b4405a37ed64e1164f20", + "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.33.0" + "version": "2.33.1" }, "dindCommit": "c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef", "variants": [ From 225f48929539dd54feb60403ea069b490a18e19d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 26 Feb 2025 09:43:10 -0800 Subject: [PATCH 461/667] Update 28 to 28.0.1 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-1809/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 9e867a202..ac5cab4b4 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.0.0 +ENV DOCKER_VERSION 28.0.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index 011fad0e6..73fde18d2 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/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-28.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 59404fa18..1e8ef547b 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 547a05fc2..df4b1ddf6 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/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 28.0.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.0.zip +ENV DOCKER_VERSION 28.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.1.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/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 8c2ab4764..851b7fec0 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.0.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.0.zip +ENV DOCKER_VERSION 28.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.1.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index ce76da38e..85b4e8308 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.0.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.0.zip +ENV DOCKER_VERSION 28.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.1.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/versions.json b/versions.json index 152c4552a..cb72fb1b8 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.0.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.0.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.0.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.0.1.zip" } }, "buildx": { @@ -158,7 +158,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "28.0.0" + "version": "28.0.1" }, "28-rc": null } From 57fabd8ee01043647f02012ede62b354efdaf12f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 3 Mar 2025 10:04:16 -0800 Subject: [PATCH 462/667] Update 28 to buildx 0.21.2 --- 28/cli/Dockerfile | 30 +++---- 28/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 80 +++++++++---------- 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index ac5cab4b4..261f853cd 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.21.1 +ENV DOCKER_BUILDX_VERSION 0.21.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-amd64'; \ - sha256='7f355525bfaf411302570b705118181b720f18071f4be3f0eaac7b2297d826e2'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-amd64'; \ + sha256='b13bee81c3db12a4be7d0b9d042b64d0dd9ed116f7674dfac0ffdf2a71acfe3d'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm-v6'; \ - sha256='f841251fd67646e8b6bb4c7e0c2c385f6a1dc7403f5ac6ee7b07c96f0815f7f3'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm-v6'; \ + sha256='70dabedf4afe192e23a00c0bfe6ecda000545059abfce339f72f45b41f4fbb45'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm-v7'; \ - sha256='81d7040e90e9b69cb0378778f673e1fc2a24ef6dbd47931dc83ab6472fc5809d'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm-v7'; \ + sha256='c41700549bbf783e861cfe0c918aa152ece87cac099a260995b3822e75e3838b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm64'; \ - sha256='42d5cee287ec7426de5252276a05f3ea565ac2d65d62d052b885a84dd54152d5'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm64'; \ + sha256='7e21e62eae3243e476411c9bbe93b8ee59b5d62ddf075c527d168174c3ab3a04'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-ppc64le'; \ - sha256='6a4e6a243f83d80cd46c939f327b2e14cfddd2c6690651cf48d0e208c3345b88'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-ppc64le'; \ + sha256='c817caec1e697484e8375d0fda499407e9081c8952db62edf702ccbb5d93187c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-riscv64'; \ - sha256='eae82aec74a420c3d1734123e6a3bc10b3a2a981aa1d538502373e31c91bf76e'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-riscv64'; \ + sha256='cdac31a493fc19fab46962bbbb4fdec6d14c1549c1b5cacafc7eb5d60fe11b75'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-s390x'; \ - sha256='97b112b3366a471cc375e0f881d65a9a7b07f0962f308834c37f5c3fa75aad08'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-s390x'; \ + sha256='bd89f667a10870a9ce11e60a1028a2fa0395c85f27ba0faaf8d338771fb65416'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index df4b1ddf6..404f5195b 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ab3eba3acbfa6b6612690af075795254f29762efc8abace5f636b8e7628b1851 +ENV DOCKER_BUILDX_VERSION 0.21.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 480d8f92cbb58a9c25227b070de90f0d24531f6a82be1f18b55950714ad52f15 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 851b7fec0..449d778fb 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ab3eba3acbfa6b6612690af075795254f29762efc8abace5f636b8e7628b1851 +ENV DOCKER_BUILDX_VERSION 0.21.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 480d8f92cbb58a9c25227b070de90f0d24531f6a82be1f18b55950714ad52f15 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 85b4e8308..32730db2d 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ab3eba3acbfa6b6612690af075795254f29762efc8abace5f636b8e7628b1851 +ENV DOCKER_BUILDX_VERSION 0.21.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 480d8f92cbb58a9c25227b070de90f0d24531f6a82be1f18b55950714ad52f15 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index cb72fb1b8..334104605 100644 --- a/versions.json +++ b/versions.json @@ -22,72 +22,72 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.21.1.linux-amd64", - "sha256": "7f355525bfaf411302570b705118181b720f18071f4be3f0eaac7b2297d826e2", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-amd64" + "file": "buildx-v0.21.2.linux-amd64", + "sha256": "b13bee81c3db12a4be7d0b9d042b64d0dd9ed116f7674dfac0ffdf2a71acfe3d", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.21.1.linux-arm-v6", - "sha256": "f841251fd67646e8b6bb4c7e0c2c385f6a1dc7403f5ac6ee7b07c96f0815f7f3", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm-v6" + "file": "buildx-v0.21.2.linux-arm-v6", + "sha256": "70dabedf4afe192e23a00c0bfe6ecda000545059abfce339f72f45b41f4fbb45", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.21.1.linux-arm-v7", - "sha256": "81d7040e90e9b69cb0378778f673e1fc2a24ef6dbd47931dc83ab6472fc5809d", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm-v7" + "file": "buildx-v0.21.2.linux-arm-v7", + "sha256": "c41700549bbf783e861cfe0c918aa152ece87cac099a260995b3822e75e3838b", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.21.1.linux-arm64", - "sha256": "42d5cee287ec7426de5252276a05f3ea565ac2d65d62d052b885a84dd54152d5", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm64" + "file": "buildx-v0.21.2.linux-arm64", + "sha256": "7e21e62eae3243e476411c9bbe93b8ee59b5d62ddf075c527d168174c3ab3a04", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.21.1.freebsd-amd64", - "sha256": "4353da82953f9e26dd0d76cc64efb27a9564aed92065b5e8144b52dadcf603ae", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.freebsd-amd64" + "file": "buildx-v0.21.2.freebsd-amd64", + "sha256": "7de537186aabe16cb819ac1e4c9fbd4d27c1c65086a22e36f3a382b90819e78b", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.21.1.freebsd-arm64", - "sha256": "241c204f3e10636d64e4eb966f30ab63468fb3b80b9777697df44d6f42d8a828", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.freebsd-arm64" + "file": "buildx-v0.21.2.freebsd-arm64", + "sha256": "5b6cca2504238f31631c168e0af034057ffa08ac9d24666b2ed7cc28cee5292e", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.freebsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.21.1.openbsd-amd64", - "sha256": "db22ce7c5d2f28a1d40f6892ba6e783b065fd27ff14c507b8ec4ed6a5cca442d", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.openbsd-amd64" + "file": "buildx-v0.21.2.openbsd-amd64", + "sha256": "15082929b7039d6456c6600dab5fd889a8392352131bc378e7cbd25fe5a9586a", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.21.1.openbsd-arm64", - "sha256": "f691a9760ee5fa9da0856d35d12d71216828164eb94e4bbf93d1b706fa76c7c2", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.openbsd-arm64" + "file": "buildx-v0.21.2.openbsd-arm64", + "sha256": "c344f4647f358490f37bdc2d93cf8c3affab99a2125f8002a28e9d4aed37e87e", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.21.1.linux-ppc64le", - "sha256": "6a4e6a243f83d80cd46c939f327b2e14cfddd2c6690651cf48d0e208c3345b88", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-ppc64le" + "file": "buildx-v0.21.2.linux-ppc64le", + "sha256": "c817caec1e697484e8375d0fda499407e9081c8952db62edf702ccbb5d93187c", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.21.1.linux-riscv64", - "sha256": "eae82aec74a420c3d1734123e6a3bc10b3a2a981aa1d538502373e31c91bf76e", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-riscv64" + "file": "buildx-v0.21.2.linux-riscv64", + "sha256": "cdac31a493fc19fab46962bbbb4fdec6d14c1549c1b5cacafc7eb5d60fe11b75", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.21.1.linux-s390x", - "sha256": "97b112b3366a471cc375e0f881d65a9a7b07f0962f308834c37f5c3fa75aad08", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-s390x" + "file": "buildx-v0.21.2.linux-s390x", + "sha256": "bd89f667a10870a9ce11e60a1028a2fa0395c85f27ba0faaf8d338771fb65416", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.21.1.windows-amd64.exe", - "sha256": "ab3eba3acbfa6b6612690af075795254f29762efc8abace5f636b8e7628b1851", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-amd64.exe" + "file": "buildx-v0.21.2.windows-amd64.exe", + "sha256": "480d8f92cbb58a9c25227b070de90f0d24531f6a82be1f18b55950714ad52f15", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.21.1.windows-arm64.exe", - "sha256": "b46c97208860b6fb83e9c69ac01379a1991b1c428a0b89def443fc1972f7b3cd", - "url": "https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-arm64.exe" + "file": "buildx-v0.21.2.windows-arm64.exe", + "sha256": "cae4755308510e16e2c48c74152c1135612cfa981f72a6cd69df118d9b35232a", + "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.windows-arm64.exe" } }, - "version": "0.21.1" + "version": "0.21.2" }, "compose": { "arches": { From dfcf538ee027612d88728252b9e9442738dae726 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 14 Mar 2025 04:04:27 -0700 Subject: [PATCH 463/667] Update 28 to compose 2.34.0 --- 28/cli/Dockerfile | 30 ++++++------ 28/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 261f853cd..de6bf242d 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.33.1 +ENV DOCKER_COMPOSE_VERSION 2.34.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-x86_64'; \ - sha256='3efda1ad6caed49dedd5644cadbf7e0c9cc3d74d8844ca5237b6a43ac1ef1a46'; \ + url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-x86_64'; \ + sha256='94a416c6f2836a0a1ba5eb3feb00f2e700a9d98311f062c4c61494ccbf3cd457'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-armv6'; \ - sha256='17e66154ed90d43d4c26dec4a77caeaa6f0a8337f436cc4bffecbc2fd9bcd27d'; \ + url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-armv6'; \ + sha256='f581de955d332f10323ff98dc3faf4b13f7ba9c5372dac3b389ad28f8dc85b1e'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-armv7'; \ - sha256='0104e689d29597352a715f7027205d7517f17f449ffe14099aa9d5d0a54f7073'; \ + url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-armv7'; \ + sha256='9080c489047880546b0269b74d0750d94ef604fe4a3c11b2e5dfad436b1e4fa6'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-aarch64'; \ - sha256='fa0e077510c852237b0da426d0daf6853446e7760145ce7665ec401892a4d0de'; \ + url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-aarch64'; \ + sha256='cd1ef5eda1119edb9314c0224bac97cee14a9c31909a0f7aa0ddfe266e08adaa'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-ppc64le'; \ - sha256='79d874b04c972475867e2e1f69febdadc446289af32afaa0dcb99f48a25380cc'; \ + url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-ppc64le'; \ + sha256='ec2c9e4083ce1bd6b3c30ddd30002bc5d9c83b4749a20e853ea73e1e14ad7b9c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-riscv64'; \ - sha256='8a51f33cb82afc6b7ce1c02b3161ce928387e96efa7b838e2f9f1fa554d68781'; \ + url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-riscv64'; \ + sha256='5d3bf73eb9fa9f7576ba8f2bc2f231b684b453b747dc55b6cadde7566c34f6dc'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-s390x'; \ - sha256='bae7fd067dd05951e4c6cb66199d2e7f388b5c19856db760fe4253dfdf2a008e'; \ + url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-s390x'; \ + sha256='558955aebe0f5965bd5e9449415a746905a7f4c58f8642946e576becf1745376'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 404f5195b..65bfc9fef 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 01bce3456228d8e1e4b0ba056f4b9730b7fd2c1a7113c8a985144c0fdee797b0 +ENV DOCKER_COMPOSE_VERSION 2.34.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3c6d3548d9dae2939ada367ffdf416aa0e2d282bc6a41d2b49eaa016994c112c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 449d778fb..97abeb52f 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 01bce3456228d8e1e4b0ba056f4b9730b7fd2c1a7113c8a985144c0fdee797b0 +ENV DOCKER_COMPOSE_VERSION 2.34.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3c6d3548d9dae2939ada367ffdf416aa0e2d282bc6a41d2b49eaa016994c112c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 32730db2d..8d06aede5 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.33.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 01bce3456228d8e1e4b0ba056f4b9730b7fd2c1a7113c8a985144c0fdee797b0 +ENV DOCKER_COMPOSE_VERSION 2.34.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 3c6d3548d9dae2939ada367ffdf416aa0e2d282bc6a41d2b49eaa016994c112c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 334104605..af834e539 100644 --- a/versions.json +++ b/versions.json @@ -93,61 +93,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "3efda1ad6caed49dedd5644cadbf7e0c9cc3d74d8844ca5237b6a43ac1ef1a46", - "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-x86_64" + "sha256": "94a416c6f2836a0a1ba5eb3feb00f2e700a9d98311f062c4c61494ccbf3cd457", + "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "17e66154ed90d43d4c26dec4a77caeaa6f0a8337f436cc4bffecbc2fd9bcd27d", - "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-armv6" + "sha256": "f581de955d332f10323ff98dc3faf4b13f7ba9c5372dac3b389ad28f8dc85b1e", + "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "0104e689d29597352a715f7027205d7517f17f449ffe14099aa9d5d0a54f7073", - "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-armv7" + "sha256": "9080c489047880546b0269b74d0750d94ef604fe4a3c11b2e5dfad436b1e4fa6", + "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "fa0e077510c852237b0da426d0daf6853446e7760145ce7665ec401892a4d0de", - "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-aarch64" + "sha256": "cd1ef5eda1119edb9314c0224bac97cee14a9c31909a0f7aa0ddfe266e08adaa", + "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "17c05c6a42cab2302efed50e837aac099a52b10f9fc90dab04929496449b22ef", - "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-darwin-x86_64" + "sha256": "db5fe0e8ba306db5ff809730f882b8ddb96853c5b780d9fa6b56ed527b1e053a", + "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "0577710624554abe3c357be069205321751f8d429d75f93de993be0de2e27107", - "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-darwin-aarch64" + "sha256": "d3835ed0a2fa6895b8bf2bc513ae1999c8b93061d48bc8e3c6384ba4732a4373", + "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "79d874b04c972475867e2e1f69febdadc446289af32afaa0dcb99f48a25380cc", - "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-ppc64le" + "sha256": "ec2c9e4083ce1bd6b3c30ddd30002bc5d9c83b4749a20e853ea73e1e14ad7b9c", + "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "8a51f33cb82afc6b7ce1c02b3161ce928387e96efa7b838e2f9f1fa554d68781", - "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-riscv64" + "sha256": "5d3bf73eb9fa9f7576ba8f2bc2f231b684b453b747dc55b6cadde7566c34f6dc", + "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "bae7fd067dd05951e4c6cb66199d2e7f388b5c19856db760fe4253dfdf2a008e", - "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-s390x" + "sha256": "558955aebe0f5965bd5e9449415a746905a7f4c58f8642946e576becf1745376", + "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "01bce3456228d8e1e4b0ba056f4b9730b7fd2c1a7113c8a985144c0fdee797b0", - "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-x86_64.exe" + "sha256": "3c6d3548d9dae2939ada367ffdf416aa0e2d282bc6a41d2b49eaa016994c112c", + "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "bc9d23c97520cc7c3af0479b02c7155bf538891eb150b4405a37ed64e1164f20", - "url": "https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-aarch64.exe" + "sha256": "4e96a9ccb1713539d18d8006f29485234c152778b3531ed602884738f6bfd81f", + "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.33.1" + "version": "2.34.0" }, "dindCommit": "c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef", "variants": [ From e5a2089a25b32ec91546fbfd008cc19593f802c2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 17 Mar 2025 16:04:16 -0700 Subject: [PATCH 464/667] Update 28 to buildx 0.21.3 --- 28/cli/Dockerfile | 30 +++---- 28/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 80 +++++++++---------- 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index de6bf242d..52f7f35bd 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.21.2 +ENV DOCKER_BUILDX_VERSION 0.21.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-amd64'; \ - sha256='b13bee81c3db12a4be7d0b9d042b64d0dd9ed116f7674dfac0ffdf2a71acfe3d'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-amd64'; \ + sha256='47f456339ca8926efcb7266f700a3bbb8a472585d977e7e2f6f22242ea6531c6'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm-v6'; \ - sha256='70dabedf4afe192e23a00c0bfe6ecda000545059abfce339f72f45b41f4fbb45'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm-v6'; \ + sha256='79ec391c50d1ebb3f38e842dcb8b27423f07b4554dd64052a08e82387a965fcc'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm-v7'; \ - sha256='c41700549bbf783e861cfe0c918aa152ece87cac099a260995b3822e75e3838b'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm-v7'; \ + sha256='b5ecd26229143997cb597ba1c705def85d85dccdbfdbbbbef44bd84c9a0c0a54'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm64'; \ - sha256='7e21e62eae3243e476411c9bbe93b8ee59b5d62ddf075c527d168174c3ab3a04'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm64'; \ + sha256='90157681a0a033b285e80d3350741452d7647994fb371c9ee3a423f2ca4f22cc'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-ppc64le'; \ - sha256='c817caec1e697484e8375d0fda499407e9081c8952db62edf702ccbb5d93187c'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-ppc64le'; \ + sha256='d27713f8f297db6e808787a15843a3af0b345a53ff23dac53b775ad8277d408e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-riscv64'; \ - sha256='cdac31a493fc19fab46962bbbb4fdec6d14c1549c1b5cacafc7eb5d60fe11b75'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-riscv64'; \ + sha256='bf34fcc2d2d78ae5aab34f515d952918451e849f06739dffcc6f9d87b1bfb1a7'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-s390x'; \ - sha256='bd89f667a10870a9ce11e60a1028a2fa0395c85f27ba0faaf8d338771fb65416'; \ + url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-s390x'; \ + sha256='73a6738f54542115ceeb92ecef751703f9d868607280ab1715380d9751e35ccb'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 65bfc9fef..5557d2aaf 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 480d8f92cbb58a9c25227b070de90f0d24531f6a82be1f18b55950714ad52f15 +ENV DOCKER_BUILDX_VERSION 0.21.3 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f9ccbfaf42c68e61833f7031e0bdb4b71931cf5ef54d132b39f9faccda02ec7c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 97abeb52f..c9c116693 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 480d8f92cbb58a9c25227b070de90f0d24531f6a82be1f18b55950714ad52f15 +ENV DOCKER_BUILDX_VERSION 0.21.3 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f9ccbfaf42c68e61833f7031e0bdb4b71931cf5ef54d132b39f9faccda02ec7c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 8d06aede5..9d0e819f0 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 480d8f92cbb58a9c25227b070de90f0d24531f6a82be1f18b55950714ad52f15 +ENV DOCKER_BUILDX_VERSION 0.21.3 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f9ccbfaf42c68e61833f7031e0bdb4b71931cf5ef54d132b39f9faccda02ec7c RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index af834e539..93f6f5638 100644 --- a/versions.json +++ b/versions.json @@ -22,72 +22,72 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.21.2.linux-amd64", - "sha256": "b13bee81c3db12a4be7d0b9d042b64d0dd9ed116f7674dfac0ffdf2a71acfe3d", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-amd64" + "file": "buildx-v0.21.3.linux-amd64", + "sha256": "47f456339ca8926efcb7266f700a3bbb8a472585d977e7e2f6f22242ea6531c6", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.21.2.linux-arm-v6", - "sha256": "70dabedf4afe192e23a00c0bfe6ecda000545059abfce339f72f45b41f4fbb45", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm-v6" + "file": "buildx-v0.21.3.linux-arm-v6", + "sha256": "79ec391c50d1ebb3f38e842dcb8b27423f07b4554dd64052a08e82387a965fcc", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.21.2.linux-arm-v7", - "sha256": "c41700549bbf783e861cfe0c918aa152ece87cac099a260995b3822e75e3838b", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm-v7" + "file": "buildx-v0.21.3.linux-arm-v7", + "sha256": "b5ecd26229143997cb597ba1c705def85d85dccdbfdbbbbef44bd84c9a0c0a54", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.21.2.linux-arm64", - "sha256": "7e21e62eae3243e476411c9bbe93b8ee59b5d62ddf075c527d168174c3ab3a04", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-arm64" + "file": "buildx-v0.21.3.linux-arm64", + "sha256": "90157681a0a033b285e80d3350741452d7647994fb371c9ee3a423f2ca4f22cc", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.21.2.freebsd-amd64", - "sha256": "7de537186aabe16cb819ac1e4c9fbd4d27c1c65086a22e36f3a382b90819e78b", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.freebsd-amd64" + "file": "buildx-v0.21.3.freebsd-amd64", + "sha256": "80a3cb716fa280345623e6090c5017c0ec1dff6d7029fa925ed6f16a00ebd57a", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.21.2.freebsd-arm64", - "sha256": "5b6cca2504238f31631c168e0af034057ffa08ac9d24666b2ed7cc28cee5292e", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.freebsd-arm64" + "file": "buildx-v0.21.3.freebsd-arm64", + "sha256": "e5582d4a16d22285cc22b24fa41621e92b3cdf1a9308da17b65342b752ffaf4b", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.freebsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.21.2.openbsd-amd64", - "sha256": "15082929b7039d6456c6600dab5fd889a8392352131bc378e7cbd25fe5a9586a", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.openbsd-amd64" + "file": "buildx-v0.21.3.openbsd-amd64", + "sha256": "e427ff924f906a3050c157185999135e2f9e6d8ecdc4b52cfa64becac1e9b4e6", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.21.2.openbsd-arm64", - "sha256": "c344f4647f358490f37bdc2d93cf8c3affab99a2125f8002a28e9d4aed37e87e", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.openbsd-arm64" + "file": "buildx-v0.21.3.openbsd-arm64", + "sha256": "5c096639a9f6997c1239571037e29af5c45e59612479fc1e2152ff50b81264d8", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.21.2.linux-ppc64le", - "sha256": "c817caec1e697484e8375d0fda499407e9081c8952db62edf702ccbb5d93187c", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-ppc64le" + "file": "buildx-v0.21.3.linux-ppc64le", + "sha256": "d27713f8f297db6e808787a15843a3af0b345a53ff23dac53b775ad8277d408e", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.21.2.linux-riscv64", - "sha256": "cdac31a493fc19fab46962bbbb4fdec6d14c1549c1b5cacafc7eb5d60fe11b75", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-riscv64" + "file": "buildx-v0.21.3.linux-riscv64", + "sha256": "bf34fcc2d2d78ae5aab34f515d952918451e849f06739dffcc6f9d87b1bfb1a7", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-riscv64" }, "s390x": { - "file": "buildx-v0.21.2.linux-s390x", - "sha256": "bd89f667a10870a9ce11e60a1028a2fa0395c85f27ba0faaf8d338771fb65416", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.linux-s390x" + "file": "buildx-v0.21.3.linux-s390x", + "sha256": "73a6738f54542115ceeb92ecef751703f9d868607280ab1715380d9751e35ccb", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.21.2.windows-amd64.exe", - "sha256": "480d8f92cbb58a9c25227b070de90f0d24531f6a82be1f18b55950714ad52f15", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.windows-amd64.exe" + "file": "buildx-v0.21.3.windows-amd64.exe", + "sha256": "f9ccbfaf42c68e61833f7031e0bdb4b71931cf5ef54d132b39f9faccda02ec7c", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.21.2.windows-arm64.exe", - "sha256": "cae4755308510e16e2c48c74152c1135612cfa981f72a6cd69df118d9b35232a", - "url": "https://github.com/docker/buildx/releases/download/v0.21.2/buildx-v0.21.2.windows-arm64.exe" + "file": "buildx-v0.21.3.windows-arm64.exe", + "sha256": "62adf60e2fc1511680b3e71c1a49a0e38d6b551ae8fab1c677271b4d999e6537", + "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.windows-arm64.exe" } }, - "version": "0.21.2" + "version": "0.21.3" }, "compose": { "arches": { From 19865eec3d5d5fd493d4de74ea89cd98f6c95343 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Wed, 19 Mar 2025 15:19:34 -0700 Subject: [PATCH 465/667] Adjust jq regex to account for (more) BSD artifacts --- versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.sh b/versions.sh index 3fe6e3141..eb38d8c65 100755 --- a/versions.sh +++ b/versions.sh @@ -103,7 +103,7 @@ for buildxVersion in $buildxVersions; do | select(.file | test("[.]json$") | not) | { ( .file - | capture("[.](?linux|windows|darwin|freebsd|openbsd)-(?[^.]+)(?[.]exe)?$") + | capture("[.](?linux|windows|darwin|[a-z0-9]*bsd)-(?[^.]+)(?[.]exe)?$") // error("failed to parse os-arch from filename: " + .) | if .os == "linux" then "" else .os + "-" end + ({ From b8a0cd47873fbc6f6f3a58eee18ebeb79f7376e0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 19 Mar 2025 15:58:31 -0700 Subject: [PATCH 466/667] Update 28 to 28.0.2, buildx 0.22.0 --- 28/cli/Dockerfile | 40 +++---- 28/dind-rootless/Dockerfile | 4 +- 28/dind/Dockerfile | 8 +- 28/windows/windowsservercore-1809/Dockerfile | 10 +- .../windowsservercore-ltsc2022/Dockerfile | 10 +- .../windowsservercore-ltsc2025/Dockerfile | 10 +- versions.json | 106 ++++++++++-------- 7 files changed, 99 insertions(+), 89 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 52f7f35bd..03dd9252f 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.0.1 +ENV DOCKER_VERSION 28.0.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.21.3 +ENV DOCKER_BUILDX_VERSION 0.22.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-amd64'; \ - sha256='47f456339ca8926efcb7266f700a3bbb8a472585d977e7e2f6f22242ea6531c6'; \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-amd64'; \ + sha256='805195386fba0cea5a1487cf0d47da82a145ea0a792bd3fb477583e2dbcdcc2f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm-v6'; \ - sha256='79ec391c50d1ebb3f38e842dcb8b27423f07b4554dd64052a08e82387a965fcc'; \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v6'; \ + sha256='24307aab46799cee78af26f3de11e82f029e6bbf36ece9b09335dbcebbca8bc7'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm-v7'; \ - sha256='b5ecd26229143997cb597ba1c705def85d85dccdbfdbbbbef44bd84c9a0c0a54'; \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v7'; \ + sha256='de55bb6389524edd0b707d4ff63118e63ec015379e3e4daf94ca6127878dbe04'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm64'; \ - sha256='90157681a0a033b285e80d3350741452d7647994fb371c9ee3a423f2ca4f22cc'; \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm64'; \ + sha256='6e9e455b5ec1c7ac708f2640a86c5cecce38c72e48acff6cb219dfdfa2dda781'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-ppc64le'; \ - sha256='d27713f8f297db6e808787a15843a3af0b345a53ff23dac53b775ad8277d408e'; \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-ppc64le'; \ + sha256='f47d600506783d9ee47bfca3287fdeb17123ac59c5a046393bd5cacb3050d1b5'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-riscv64'; \ - sha256='bf34fcc2d2d78ae5aab34f515d952918451e849f06739dffcc6f9d87b1bfb1a7'; \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-riscv64'; \ + sha256='812cffddafac44c0ff7a86221c321763c49a32ea65e1194ef489ba1ef5e47e70'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-s390x'; \ - sha256='73a6738f54542115ceeb92ecef751703f9d868607280ab1715380d9751e35ccb'; \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-s390x'; \ + sha256='bfc6cfb663d1b6e2ed6ff1bf0f820024eac67145d29cb33cb24790b18f23fff4'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index 73fde18d2..253f51d2c 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/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-28.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 1e8ef547b..1b58da4d6 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 5557d2aaf..0104b88f6 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/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 28.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.1.zip +ENV DOCKER_VERSION 28.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.2.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) @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.3 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f9ccbfaf42c68e61833f7031e0bdb4b71931cf5ef54d132b39f9faccda02ec7c +ENV DOCKER_BUILDX_VERSION 0.22.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index c9c116693..8ed96a038 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.1.zip +ENV DOCKER_VERSION 28.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.2.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) @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.3 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f9ccbfaf42c68e61833f7031e0bdb4b71931cf5ef54d132b39f9faccda02ec7c +ENV DOCKER_BUILDX_VERSION 0.22.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 9d0e819f0..44337b2cf 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.1.zip +ENV DOCKER_VERSION 28.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.2.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) @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.21.3 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f9ccbfaf42c68e61833f7031e0bdb4b71931cf5ef54d132b39f9faccda02ec7c +ENV DOCKER_BUILDX_VERSION 0.22.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 93f6f5638..5042aef68 100644 --- a/versions.json +++ b/versions.json @@ -2,92 +2,102 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.0.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.0.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.0.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.0.2.zip" } }, "buildx": { "arches": { "amd64": { - "file": "buildx-v0.21.3.linux-amd64", - "sha256": "47f456339ca8926efcb7266f700a3bbb8a472585d977e7e2f6f22242ea6531c6", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-amd64" + "file": "buildx-v0.22.0.linux-amd64", + "sha256": "805195386fba0cea5a1487cf0d47da82a145ea0a792bd3fb477583e2dbcdcc2f", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.21.3.linux-arm-v6", - "sha256": "79ec391c50d1ebb3f38e842dcb8b27423f07b4554dd64052a08e82387a965fcc", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm-v6" + "file": "buildx-v0.22.0.linux-arm-v6", + "sha256": "24307aab46799cee78af26f3de11e82f029e6bbf36ece9b09335dbcebbca8bc7", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.21.3.linux-arm-v7", - "sha256": "b5ecd26229143997cb597ba1c705def85d85dccdbfdbbbbef44bd84c9a0c0a54", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm-v7" + "file": "buildx-v0.22.0.linux-arm-v7", + "sha256": "de55bb6389524edd0b707d4ff63118e63ec015379e3e4daf94ca6127878dbe04", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.21.3.linux-arm64", - "sha256": "90157681a0a033b285e80d3350741452d7647994fb371c9ee3a423f2ca4f22cc", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-arm64" + "file": "buildx-v0.22.0.linux-arm64", + "sha256": "6e9e455b5ec1c7ac708f2640a86c5cecce38c72e48acff6cb219dfdfa2dda781", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.21.3.freebsd-amd64", - "sha256": "80a3cb716fa280345623e6090c5017c0ec1dff6d7029fa925ed6f16a00ebd57a", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.freebsd-amd64" + "file": "buildx-v0.22.0.freebsd-amd64", + "sha256": "3667ba104ab361f7140538b9915ccd3688efe87b1ab2e4917878e7459564a41e", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.21.3.freebsd-arm64", - "sha256": "e5582d4a16d22285cc22b24fa41621e92b3cdf1a9308da17b65342b752ffaf4b", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.freebsd-arm64" + "file": "buildx-v0.22.0.freebsd-arm64", + "sha256": "55c5b1a47b979f866f432146257b47e7725ca5017a6b7bed2dc7e786703129e4", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.22.0.netbsd-amd64", + "sha256": "44ed0bf0d5fd453c6b69e4e1bf369c17ca57b5022e1917ef1f55cf3def75f22b", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.22.0.netbsd-arm64", + "sha256": "0a73393889f6463d9789d0ac546ddefa5b5a0324a2e9dc109056cd0405e24258", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.21.3.openbsd-amd64", - "sha256": "e427ff924f906a3050c157185999135e2f9e6d8ecdc4b52cfa64becac1e9b4e6", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.openbsd-amd64" + "file": "buildx-v0.22.0.openbsd-amd64", + "sha256": "2cb70f94655bdd9df43b7817cb30d206cf96a0037b7581f8901cb4ec3ebed26a", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.21.3.openbsd-arm64", - "sha256": "5c096639a9f6997c1239571037e29af5c45e59612479fc1e2152ff50b81264d8", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.openbsd-arm64" + "file": "buildx-v0.22.0.openbsd-arm64", + "sha256": "468439a0560d1f5fda69abc1beb523cfeab5a3e153f118068cf367185438909b", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.21.3.linux-ppc64le", - "sha256": "d27713f8f297db6e808787a15843a3af0b345a53ff23dac53b775ad8277d408e", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-ppc64le" + "file": "buildx-v0.22.0.linux-ppc64le", + "sha256": "f47d600506783d9ee47bfca3287fdeb17123ac59c5a046393bd5cacb3050d1b5", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.21.3.linux-riscv64", - "sha256": "bf34fcc2d2d78ae5aab34f515d952918451e849f06739dffcc6f9d87b1bfb1a7", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-riscv64" + "file": "buildx-v0.22.0.linux-riscv64", + "sha256": "812cffddafac44c0ff7a86221c321763c49a32ea65e1194ef489ba1ef5e47e70", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.21.3.linux-s390x", - "sha256": "73a6738f54542115ceeb92ecef751703f9d868607280ab1715380d9751e35ccb", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.linux-s390x" + "file": "buildx-v0.22.0.linux-s390x", + "sha256": "bfc6cfb663d1b6e2ed6ff1bf0f820024eac67145d29cb33cb24790b18f23fff4", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.21.3.windows-amd64.exe", - "sha256": "f9ccbfaf42c68e61833f7031e0bdb4b71931cf5ef54d132b39f9faccda02ec7c", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.windows-amd64.exe" + "file": "buildx-v0.22.0.windows-amd64.exe", + "sha256": "446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.21.3.windows-arm64.exe", - "sha256": "62adf60e2fc1511680b3e71c1a49a0e38d6b551ae8fab1c677271b4d999e6537", - "url": "https://github.com/docker/buildx/releases/download/v0.21.3/buildx-v0.21.3.windows-arm64.exe" + "file": "buildx-v0.22.0.windows-arm64.exe", + "sha256": "615e63b3cdcecc3d98ae112114017bbcf2ed9dc0024d7625a4b7dbd5469e7490", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-arm64.exe" } }, - "version": "0.21.3" + "version": "0.22.0" }, "compose": { "arches": { @@ -158,7 +168,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "28.0.1" + "version": "28.0.2" }, "28-rc": null } From 9d9f395c22ee346b32052ce8a19d55b469ed0737 Mon Sep 17 00:00:00 2001 From: NamrathShetty Date: Sat, 22 Mar 2025 12:33:44 +0530 Subject: [PATCH 467/667] Change shebang to use env for better portability --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index f19a544c0..214077c0f 100755 --- a/update.sh +++ b/update.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eo pipefail cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" From 9412765b2bf39a5264743697803116653b990243 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 25 Mar 2025 10:04:17 -0700 Subject: [PATCH 468/667] Update 28 to 28.0.4 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-1809/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 03dd9252f..fd123b322 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.0.2 +ENV DOCKER_VERSION 28.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-28.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.0.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index 253f51d2c..1fa5a02b2 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/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-28.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 1b58da4d6..3b425f50c 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.0.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 0104b88f6..77d1cc53b 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/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 28.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.2.zip +ENV DOCKER_VERSION 28.0.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.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/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 8ed96a038..8f00b9617 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.2.zip +ENV DOCKER_VERSION 28.0.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 44337b2cf..41526a575 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.2.zip +ENV DOCKER_VERSION 28.0.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.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/versions.json b/versions.json index 5042aef68..e6dc66fa9 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.0.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.4.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.0.4.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.0.4.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.0.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.4.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.0.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.0.4.zip" } }, "buildx": { @@ -168,7 +168,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "28.0.2" + "version": "28.0.4" }, "28-rc": null } From 63ecacfddacf6340f6440b09f90c4c62b36f406d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 27 Mar 2025 04:04:16 -0700 Subject: [PATCH 469/667] Update 28 --- 28/dind/Dockerfile | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 3b425f50c..9069f17ee 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -93,7 +93,7 @@ RUN set -eux; \ runc --version # https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d RUN set -eux; \ wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ diff --git a/versions.json b/versions.json index e6dc66fa9..6b0d60ac5 100644 --- a/versions.json +++ b/versions.json @@ -159,7 +159,7 @@ }, "version": "2.34.0" }, - "dindCommit": "c43aa0b6aa7c88343f0951ba9a39c69aa51c54ef", + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ "cli", "dind", From ad3602ce8c2b580c2efb6431610b355044dabb7b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 10 Apr 2025 10:04:16 -0700 Subject: [PATCH 470/667] Update 28 to compose 2.35.0 --- 28/cli/Dockerfile | 30 ++++++------ 28/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index fd123b322..ea98eb2c9 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.34.0 +ENV DOCKER_COMPOSE_VERSION 2.35.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-x86_64'; \ - sha256='94a416c6f2836a0a1ba5eb3feb00f2e700a9d98311f062c4c61494ccbf3cd457'; \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-x86_64'; \ + sha256='dba1915cf2f282527f5df0cd7a94b9503047ed200317801853abe8f22c8cd493'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-armv6'; \ - sha256='f581de955d332f10323ff98dc3faf4b13f7ba9c5372dac3b389ad28f8dc85b1e'; \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv6'; \ + sha256='e7ea8760cb2b20808bdea94b15bccdd91b80045e3f0ae9efb7d4082ea1b98328'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-armv7'; \ - sha256='9080c489047880546b0269b74d0750d94ef604fe4a3c11b2e5dfad436b1e4fa6'; \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv7'; \ + sha256='9f9831ef951fbb1eaff7dfd17e4ca2e3522a9e66670e81075b68a25fbbfc0ee2'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-aarch64'; \ - sha256='cd1ef5eda1119edb9314c0224bac97cee14a9c31909a0f7aa0ddfe266e08adaa'; \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-aarch64'; \ + sha256='a08457d837d5d4ed7c079f0721dc51ef3f21ce2d9654a6abd44944b74d975cd2'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-ppc64le'; \ - sha256='ec2c9e4083ce1bd6b3c30ddd30002bc5d9c83b4749a20e853ea73e1e14ad7b9c'; \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-ppc64le'; \ + sha256='7dfe56cde21ae0d4b96083629b5142b1f00b51baf6d3a695c0ac700822175b13'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-riscv64'; \ - sha256='5d3bf73eb9fa9f7576ba8f2bc2f231b684b453b747dc55b6cadde7566c34f6dc'; \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-riscv64'; \ + sha256='85ecd8c7ff0218a3b66a4ddcc3ef66d28b26ce9ec310531b56416cb8d6304b03'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-s390x'; \ - sha256='558955aebe0f5965bd5e9449415a746905a7f4c58f8642946e576becf1745376'; \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-s390x'; \ + sha256='f9bc89ad8d048690f3cba9c05df5bddd9d0f5dcb03bfd41ceb613d7e560a76a0'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 77d1cc53b..87c657162 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.34.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3c6d3548d9dae2939ada367ffdf416aa0e2d282bc6a41d2b49eaa016994c112c +ENV DOCKER_COMPOSE_VERSION 2.35.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 8f00b9617..f9e8ef859 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.34.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3c6d3548d9dae2939ada367ffdf416aa0e2d282bc6a41d2b49eaa016994c112c +ENV DOCKER_COMPOSE_VERSION 2.35.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 41526a575..c5cc07714 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.34.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 3c6d3548d9dae2939ada367ffdf416aa0e2d282bc6a41d2b49eaa016994c112c +ENV DOCKER_COMPOSE_VERSION 2.35.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6b0d60ac5..9a84eb9c0 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "94a416c6f2836a0a1ba5eb3feb00f2e700a9d98311f062c4c61494ccbf3cd457", - "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-x86_64" + "sha256": "dba1915cf2f282527f5df0cd7a94b9503047ed200317801853abe8f22c8cd493", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "f581de955d332f10323ff98dc3faf4b13f7ba9c5372dac3b389ad28f8dc85b1e", - "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-armv6" + "sha256": "e7ea8760cb2b20808bdea94b15bccdd91b80045e3f0ae9efb7d4082ea1b98328", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9080c489047880546b0269b74d0750d94ef604fe4a3c11b2e5dfad436b1e4fa6", - "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-armv7" + "sha256": "9f9831ef951fbb1eaff7dfd17e4ca2e3522a9e66670e81075b68a25fbbfc0ee2", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "cd1ef5eda1119edb9314c0224bac97cee14a9c31909a0f7aa0ddfe266e08adaa", - "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-aarch64" + "sha256": "a08457d837d5d4ed7c079f0721dc51ef3f21ce2d9654a6abd44944b74d975cd2", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "db5fe0e8ba306db5ff809730f882b8ddb96853c5b780d9fa6b56ed527b1e053a", - "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-darwin-x86_64" + "sha256": "3730e5cdebf017608dd25fe48539a87d66e7929ddd0f0682c3f02a5e907ca762", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "d3835ed0a2fa6895b8bf2bc513ae1999c8b93061d48bc8e3c6384ba4732a4373", - "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-darwin-aarch64" + "sha256": "ba47fee03b234c5b41a0e872fc08b6820c26bb65869ac76a35e40516969f55d4", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "ec2c9e4083ce1bd6b3c30ddd30002bc5d9c83b4749a20e853ea73e1e14ad7b9c", - "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-ppc64le" + "sha256": "7dfe56cde21ae0d4b96083629b5142b1f00b51baf6d3a695c0ac700822175b13", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "5d3bf73eb9fa9f7576ba8f2bc2f231b684b453b747dc55b6cadde7566c34f6dc", - "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-riscv64" + "sha256": "85ecd8c7ff0218a3b66a4ddcc3ef66d28b26ce9ec310531b56416cb8d6304b03", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "558955aebe0f5965bd5e9449415a746905a7f4c58f8642946e576becf1745376", - "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-linux-s390x" + "sha256": "f9bc89ad8d048690f3cba9c05df5bddd9d0f5dcb03bfd41ceb613d7e560a76a0", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "3c6d3548d9dae2939ada367ffdf416aa0e2d282bc6a41d2b49eaa016994c112c", - "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-windows-x86_64.exe" + "sha256": "bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "4e96a9ccb1713539d18d8006f29485234c152778b3531ed602884738f6bfd81f", - "url": "https://github.com/docker/compose/releases/download/v2.34.0/docker-compose-windows-aarch64.exe" + "sha256": "857df8a710275345dca13f35be18a01fc866cb0a8bac284a4377e47ef4d2c783", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.34.0" + "version": "2.35.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 583539925d539c2b934d5996a9b11167970ee9d3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 11 Apr 2025 15:41:23 -0700 Subject: [PATCH 471/667] Update 28-rc to 28.1.0-rc.1, buildx 0.22.0, compose 2.35.0 --- 28-rc/cli/Dockerfile | 167 +++++++++++++ 28-rc/cli/docker-entrypoint.sh | 61 +++++ 28-rc/cli/modprobe.sh | 20 ++ 28-rc/dind-rootless/Dockerfile | 54 ++++ 28-rc/dind/Dockerfile | 108 ++++++++ 28-rc/dind/dockerd-entrypoint.sh | 234 ++++++++++++++++++ .../windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 172 ++++++++++++- 10 files changed, 1088 insertions(+), 1 deletion(-) create mode 100644 28-rc/cli/Dockerfile create mode 100755 28-rc/cli/docker-entrypoint.sh create mode 100755 28-rc/cli/modprobe.sh create mode 100644 28-rc/dind-rootless/Dockerfile create mode 100644 28-rc/dind/Dockerfile create mode 100755 28-rc/dind/dockerd-entrypoint.sh create mode 100644 28-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile new file mode 100644 index 000000000..a7c525fc1 --- /dev/null +++ b/28-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.21 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 28.1.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.22.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-amd64'; \ + sha256='805195386fba0cea5a1487cf0d47da82a145ea0a792bd3fb477583e2dbcdcc2f'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v6'; \ + sha256='24307aab46799cee78af26f3de11e82f029e6bbf36ece9b09335dbcebbca8bc7'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v7'; \ + sha256='de55bb6389524edd0b707d4ff63118e63ec015379e3e4daf94ca6127878dbe04'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm64'; \ + sha256='6e9e455b5ec1c7ac708f2640a86c5cecce38c72e48acff6cb219dfdfa2dda781'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-ppc64le'; \ + sha256='f47d600506783d9ee47bfca3287fdeb17123ac59c5a046393bd5cacb3050d1b5'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-riscv64'; \ + sha256='812cffddafac44c0ff7a86221c321763c49a32ea65e1194ef489ba1ef5e47e70'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-s390x'; \ + sha256='bfc6cfb663d1b6e2ed6ff1bf0f820024eac67145d29cb33cb24790b18f23fff4'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.35.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-x86_64'; \ + sha256='dba1915cf2f282527f5df0cd7a94b9503047ed200317801853abe8f22c8cd493'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv6'; \ + sha256='e7ea8760cb2b20808bdea94b15bccdd91b80045e3f0ae9efb7d4082ea1b98328'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv7'; \ + sha256='9f9831ef951fbb1eaff7dfd17e4ca2e3522a9e66670e81075b68a25fbbfc0ee2'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-aarch64'; \ + sha256='a08457d837d5d4ed7c079f0721dc51ef3f21ce2d9654a6abd44944b74d975cd2'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-ppc64le'; \ + sha256='7dfe56cde21ae0d4b96083629b5142b1f00b51baf6d3a695c0ac700822175b13'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-riscv64'; \ + sha256='85ecd8c7ff0218a3b66a4ddcc3ef66d28b26ce9ec310531b56416cb8d6304b03'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-s390x'; \ + sha256='f9bc89ad8d048690f3cba9c05df5bddd9d0f5dcb03bfd41ceb613d7e560a76a0'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/28-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/28-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..7ccbfa244 --- /dev/null +++ b/28-rc/dind-rootless/Dockerfile @@ -0,0 +1,54 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.1.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.1.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile new file mode 100644 index 000000000..a0c77c808 --- /dev/null +++ b/28-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..6c06bb811 --- /dev/null +++ b/28-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,234 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..677ca7ea3 --- /dev/null +++ b/28-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.1.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.22.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.35.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..e76959d57 --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.1.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.22.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.35.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..d5b35cf63 --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.1.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.22.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.35.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 9a84eb9c0..7622b6d7f 100644 --- a/versions.json +++ b/versions.json @@ -170,5 +170,175 @@ ], "version": "28.0.4" }, - "28-rc": null + "28-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.1.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.1.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.22.0.linux-amd64", + "sha256": "805195386fba0cea5a1487cf0d47da82a145ea0a792bd3fb477583e2dbcdcc2f", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.22.0.linux-arm-v6", + "sha256": "24307aab46799cee78af26f3de11e82f029e6bbf36ece9b09335dbcebbca8bc7", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.22.0.linux-arm-v7", + "sha256": "de55bb6389524edd0b707d4ff63118e63ec015379e3e4daf94ca6127878dbe04", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.22.0.linux-arm64", + "sha256": "6e9e455b5ec1c7ac708f2640a86c5cecce38c72e48acff6cb219dfdfa2dda781", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.22.0.freebsd-amd64", + "sha256": "3667ba104ab361f7140538b9915ccd3688efe87b1ab2e4917878e7459564a41e", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.22.0.freebsd-arm64", + "sha256": "55c5b1a47b979f866f432146257b47e7725ca5017a6b7bed2dc7e786703129e4", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.22.0.netbsd-amd64", + "sha256": "44ed0bf0d5fd453c6b69e4e1bf369c17ca57b5022e1917ef1f55cf3def75f22b", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.22.0.netbsd-arm64", + "sha256": "0a73393889f6463d9789d0ac546ddefa5b5a0324a2e9dc109056cd0405e24258", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.22.0.openbsd-amd64", + "sha256": "2cb70f94655bdd9df43b7817cb30d206cf96a0037b7581f8901cb4ec3ebed26a", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.22.0.openbsd-arm64", + "sha256": "468439a0560d1f5fda69abc1beb523cfeab5a3e153f118068cf367185438909b", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.22.0.linux-ppc64le", + "sha256": "f47d600506783d9ee47bfca3287fdeb17123ac59c5a046393bd5cacb3050d1b5", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.22.0.linux-riscv64", + "sha256": "812cffddafac44c0ff7a86221c321763c49a32ea65e1194ef489ba1ef5e47e70", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.22.0.linux-s390x", + "sha256": "bfc6cfb663d1b6e2ed6ff1bf0f820024eac67145d29cb33cb24790b18f23fff4", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.22.0.windows-amd64.exe", + "sha256": "446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.22.0.windows-arm64.exe", + "sha256": "615e63b3cdcecc3d98ae112114017bbcf2ed9dc0024d7625a4b7dbd5469e7490", + "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-arm64.exe" + } + }, + "version": "0.22.0" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "dba1915cf2f282527f5df0cd7a94b9503047ed200317801853abe8f22c8cd493", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "e7ea8760cb2b20808bdea94b15bccdd91b80045e3f0ae9efb7d4082ea1b98328", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "9f9831ef951fbb1eaff7dfd17e4ca2e3522a9e66670e81075b68a25fbbfc0ee2", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "a08457d837d5d4ed7c079f0721dc51ef3f21ce2d9654a6abd44944b74d975cd2", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "3730e5cdebf017608dd25fe48539a87d66e7929ddd0f0682c3f02a5e907ca762", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "ba47fee03b234c5b41a0e872fc08b6820c26bb65869ac76a35e40516969f55d4", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "7dfe56cde21ae0d4b96083629b5142b1f00b51baf6d3a695c0ac700822175b13", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "85ecd8c7ff0218a3b66a4ddcc3ef66d28b26ce9ec310531b56416cb8d6304b03", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "f9bc89ad8d048690f3cba9c05df5bddd9d0f5dcb03bfd41ceb613d7e560a76a0", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "857df8a710275345dca13f35be18a01fc866cb0a8bac284a4377e47ef4d2c783", + "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.35.0" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "28.1.0-rc.1" + } } From 7a2ae9040feea46e1b150e97a53197eedf47f2f9 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 15 Apr 2025 10:04:15 -0700 Subject: [PATCH 472/667] Update 28 to buildx 0.23.0 --- 28/cli/Dockerfile | 30 +++--- 28/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 5 files changed, 70 insertions(+), 70 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index ea98eb2c9..3f949a1b5 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.22.0 +ENV DOCKER_BUILDX_VERSION 0.23.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-amd64'; \ - sha256='805195386fba0cea5a1487cf0d47da82a145ea0a792bd3fb477583e2dbcdcc2f'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64'; \ + sha256='55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v6'; \ - sha256='24307aab46799cee78af26f3de11e82f029e6bbf36ece9b09335dbcebbca8bc7'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6'; \ + sha256='0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v7'; \ - sha256='de55bb6389524edd0b707d4ff63118e63ec015379e3e4daf94ca6127878dbe04'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7'; \ + sha256='3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm64'; \ - sha256='6e9e455b5ec1c7ac708f2640a86c5cecce38c72e48acff6cb219dfdfa2dda781'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64'; \ + sha256='50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-ppc64le'; \ - sha256='f47d600506783d9ee47bfca3287fdeb17123ac59c5a046393bd5cacb3050d1b5'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le'; \ + sha256='d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-riscv64'; \ - sha256='812cffddafac44c0ff7a86221c321763c49a32ea65e1194ef489ba1ef5e47e70'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64'; \ + sha256='3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-s390x'; \ - sha256='bfc6cfb663d1b6e2ed6ff1bf0f820024eac67145d29cb33cb24790b18f23fff4'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x'; \ + sha256='e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 87c657162..44465f007 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.22.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 +ENV DOCKER_BUILDX_VERSION 0.23.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index f9e8ef859..412b2a4f1 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.22.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 +ENV DOCKER_BUILDX_VERSION 0.23.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index c5cc07714..6ac6a079c 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.22.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 +ENV DOCKER_BUILDX_VERSION 0.23.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 7622b6d7f..a8429a1d0 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.22.0.linux-amd64", - "sha256": "805195386fba0cea5a1487cf0d47da82a145ea0a792bd3fb477583e2dbcdcc2f", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-amd64" + "file": "buildx-v0.23.0.linux-amd64", + "sha256": "55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.22.0.linux-arm-v6", - "sha256": "24307aab46799cee78af26f3de11e82f029e6bbf36ece9b09335dbcebbca8bc7", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v6" + "file": "buildx-v0.23.0.linux-arm-v6", + "sha256": "0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.22.0.linux-arm-v7", - "sha256": "de55bb6389524edd0b707d4ff63118e63ec015379e3e4daf94ca6127878dbe04", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v7" + "file": "buildx-v0.23.0.linux-arm-v7", + "sha256": "3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.22.0.linux-arm64", - "sha256": "6e9e455b5ec1c7ac708f2640a86c5cecce38c72e48acff6cb219dfdfa2dda781", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm64" + "file": "buildx-v0.23.0.linux-arm64", + "sha256": "50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.22.0.freebsd-amd64", - "sha256": "3667ba104ab361f7140538b9915ccd3688efe87b1ab2e4917878e7459564a41e", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.freebsd-amd64" + "file": "buildx-v0.23.0.freebsd-amd64", + "sha256": "973854d845a429cb00920ca7f2540d3185fb62512b57c2398d01694bea676571", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.22.0.freebsd-arm64", - "sha256": "55c5b1a47b979f866f432146257b47e7725ca5017a6b7bed2dc7e786703129e4", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.freebsd-arm64" + "file": "buildx-v0.23.0.freebsd-arm64", + "sha256": "4adbb6003c51f2da30d11857c6e8b6f037f2324bc21d926f24b83e13483a75f1", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.22.0.netbsd-amd64", - "sha256": "44ed0bf0d5fd453c6b69e4e1bf369c17ca57b5022e1917ef1f55cf3def75f22b", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.netbsd-amd64" + "file": "buildx-v0.23.0.netbsd-amd64", + "sha256": "08aa01cf25d746fc9b15841ade4522a44c0dfb85e9616334d7452d802eef1f07", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.22.0.netbsd-arm64", - "sha256": "0a73393889f6463d9789d0ac546ddefa5b5a0324a2e9dc109056cd0405e24258", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.netbsd-arm64" + "file": "buildx-v0.23.0.netbsd-arm64", + "sha256": "4a40a4d1e8b9fa055e74ff039fa088af01eb77df4adf2ceb6dadca60f6665a9f", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.22.0.openbsd-amd64", - "sha256": "2cb70f94655bdd9df43b7817cb30d206cf96a0037b7581f8901cb4ec3ebed26a", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.openbsd-amd64" + "file": "buildx-v0.23.0.openbsd-amd64", + "sha256": "25e346b3c0e5e2dbd0f98dd5e91189b78d71ef008c3c319745ef3b8874f4ec59", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.22.0.openbsd-arm64", - "sha256": "468439a0560d1f5fda69abc1beb523cfeab5a3e153f118068cf367185438909b", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.openbsd-arm64" + "file": "buildx-v0.23.0.openbsd-arm64", + "sha256": "a009891b40e8c9e6d0ce38a477e60bf6124679b14266bdfca178f2ee4aa4161b", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.22.0.linux-ppc64le", - "sha256": "f47d600506783d9ee47bfca3287fdeb17123ac59c5a046393bd5cacb3050d1b5", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-ppc64le" + "file": "buildx-v0.23.0.linux-ppc64le", + "sha256": "d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.22.0.linux-riscv64", - "sha256": "812cffddafac44c0ff7a86221c321763c49a32ea65e1194ef489ba1ef5e47e70", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-riscv64" + "file": "buildx-v0.23.0.linux-riscv64", + "sha256": "3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.22.0.linux-s390x", - "sha256": "bfc6cfb663d1b6e2ed6ff1bf0f820024eac67145d29cb33cb24790b18f23fff4", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-s390x" + "file": "buildx-v0.23.0.linux-s390x", + "sha256": "e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.22.0.windows-amd64.exe", - "sha256": "446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe" + "file": "buildx-v0.23.0.windows-amd64.exe", + "sha256": "ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.22.0.windows-arm64.exe", - "sha256": "615e63b3cdcecc3d98ae112114017bbcf2ed9dc0024d7625a4b7dbd5469e7490", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-arm64.exe" + "file": "buildx-v0.23.0.windows-arm64.exe", + "sha256": "ad405e9c287d2f58f178823fdf7cc79ed63b3b70129e9082a7cb702639bd80f6", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-arm64.exe" } }, - "version": "0.22.0" + "version": "0.23.0" }, "compose": { "arches": { From bdca6a23026c9a0ee12cffd4e2d251224d686471 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 15 Apr 2025 10:06:08 -0700 Subject: [PATCH 473/667] Update 28-rc to buildx 0.23.0 --- 28-rc/cli/Dockerfile | 30 +++--- .../windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 5 files changed, 70 insertions(+), 70 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index a7c525fc1..6967b2cef 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.22.0 +ENV DOCKER_BUILDX_VERSION 0.23.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-amd64'; \ - sha256='805195386fba0cea5a1487cf0d47da82a145ea0a792bd3fb477583e2dbcdcc2f'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64'; \ + sha256='55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v6'; \ - sha256='24307aab46799cee78af26f3de11e82f029e6bbf36ece9b09335dbcebbca8bc7'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6'; \ + sha256='0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v7'; \ - sha256='de55bb6389524edd0b707d4ff63118e63ec015379e3e4daf94ca6127878dbe04'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7'; \ + sha256='3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm64'; \ - sha256='6e9e455b5ec1c7ac708f2640a86c5cecce38c72e48acff6cb219dfdfa2dda781'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64'; \ + sha256='50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-ppc64le'; \ - sha256='f47d600506783d9ee47bfca3287fdeb17123ac59c5a046393bd5cacb3050d1b5'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le'; \ + sha256='d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-riscv64'; \ - sha256='812cffddafac44c0ff7a86221c321763c49a32ea65e1194ef489ba1ef5e47e70'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64'; \ + sha256='3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-s390x'; \ - sha256='bfc6cfb663d1b6e2ed6ff1bf0f820024eac67145d29cb33cb24790b18f23fff4'; \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x'; \ + sha256='e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile index 677ca7ea3..79a6d4664 100644 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ b/28-rc/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.22.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 +ENV DOCKER_BUILDX_VERSION 0.23.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index e76959d57..5bc558c39 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.22.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 +ENV DOCKER_BUILDX_VERSION 0.23.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index d5b35cf63..7541e88b9 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.22.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778 +ENV DOCKER_BUILDX_VERSION 0.23.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index a8429a1d0..ba5c69cab 100644 --- a/versions.json +++ b/versions.json @@ -193,82 +193,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.22.0.linux-amd64", - "sha256": "805195386fba0cea5a1487cf0d47da82a145ea0a792bd3fb477583e2dbcdcc2f", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-amd64" + "file": "buildx-v0.23.0.linux-amd64", + "sha256": "55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.22.0.linux-arm-v6", - "sha256": "24307aab46799cee78af26f3de11e82f029e6bbf36ece9b09335dbcebbca8bc7", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v6" + "file": "buildx-v0.23.0.linux-arm-v6", + "sha256": "0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.22.0.linux-arm-v7", - "sha256": "de55bb6389524edd0b707d4ff63118e63ec015379e3e4daf94ca6127878dbe04", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm-v7" + "file": "buildx-v0.23.0.linux-arm-v7", + "sha256": "3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.22.0.linux-arm64", - "sha256": "6e9e455b5ec1c7ac708f2640a86c5cecce38c72e48acff6cb219dfdfa2dda781", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-arm64" + "file": "buildx-v0.23.0.linux-arm64", + "sha256": "50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.22.0.freebsd-amd64", - "sha256": "3667ba104ab361f7140538b9915ccd3688efe87b1ab2e4917878e7459564a41e", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.freebsd-amd64" + "file": "buildx-v0.23.0.freebsd-amd64", + "sha256": "973854d845a429cb00920ca7f2540d3185fb62512b57c2398d01694bea676571", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.22.0.freebsd-arm64", - "sha256": "55c5b1a47b979f866f432146257b47e7725ca5017a6b7bed2dc7e786703129e4", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.freebsd-arm64" + "file": "buildx-v0.23.0.freebsd-arm64", + "sha256": "4adbb6003c51f2da30d11857c6e8b6f037f2324bc21d926f24b83e13483a75f1", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.22.0.netbsd-amd64", - "sha256": "44ed0bf0d5fd453c6b69e4e1bf369c17ca57b5022e1917ef1f55cf3def75f22b", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.netbsd-amd64" + "file": "buildx-v0.23.0.netbsd-amd64", + "sha256": "08aa01cf25d746fc9b15841ade4522a44c0dfb85e9616334d7452d802eef1f07", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.22.0.netbsd-arm64", - "sha256": "0a73393889f6463d9789d0ac546ddefa5b5a0324a2e9dc109056cd0405e24258", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.netbsd-arm64" + "file": "buildx-v0.23.0.netbsd-arm64", + "sha256": "4a40a4d1e8b9fa055e74ff039fa088af01eb77df4adf2ceb6dadca60f6665a9f", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.22.0.openbsd-amd64", - "sha256": "2cb70f94655bdd9df43b7817cb30d206cf96a0037b7581f8901cb4ec3ebed26a", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.openbsd-amd64" + "file": "buildx-v0.23.0.openbsd-amd64", + "sha256": "25e346b3c0e5e2dbd0f98dd5e91189b78d71ef008c3c319745ef3b8874f4ec59", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.22.0.openbsd-arm64", - "sha256": "468439a0560d1f5fda69abc1beb523cfeab5a3e153f118068cf367185438909b", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.openbsd-arm64" + "file": "buildx-v0.23.0.openbsd-arm64", + "sha256": "a009891b40e8c9e6d0ce38a477e60bf6124679b14266bdfca178f2ee4aa4161b", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.22.0.linux-ppc64le", - "sha256": "f47d600506783d9ee47bfca3287fdeb17123ac59c5a046393bd5cacb3050d1b5", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-ppc64le" + "file": "buildx-v0.23.0.linux-ppc64le", + "sha256": "d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.22.0.linux-riscv64", - "sha256": "812cffddafac44c0ff7a86221c321763c49a32ea65e1194ef489ba1ef5e47e70", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-riscv64" + "file": "buildx-v0.23.0.linux-riscv64", + "sha256": "3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.22.0.linux-s390x", - "sha256": "bfc6cfb663d1b6e2ed6ff1bf0f820024eac67145d29cb33cb24790b18f23fff4", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.linux-s390x" + "file": "buildx-v0.23.0.linux-s390x", + "sha256": "e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.22.0.windows-amd64.exe", - "sha256": "446acafb777dc8e8b458a56ce5af3c216260e5170a3e89382b8e4b1dd5853778", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-amd64.exe" + "file": "buildx-v0.23.0.windows-amd64.exe", + "sha256": "ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.22.0.windows-arm64.exe", - "sha256": "615e63b3cdcecc3d98ae112114017bbcf2ed9dc0024d7625a4b7dbd5469e7490", - "url": "https://github.com/docker/buildx/releases/download/v0.22.0/buildx-v0.22.0.windows-arm64.exe" + "file": "buildx-v0.23.0.windows-arm64.exe", + "sha256": "ad405e9c287d2f58f178823fdf7cc79ed63b3b70129e9082a7cb702639bd80f6", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-arm64.exe" } }, - "version": "0.22.0" + "version": "0.23.0" }, "compose": { "arches": { From ddd89a5553b6b4eea3f857c5e6c5866f83fc3170 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 16 Apr 2025 10:04:23 -0700 Subject: [PATCH 474/667] Update 28-rc to 28.1.0-rc.2 --- 28-rc/cli/Dockerfile | 10 +++++----- 28-rc/dind-rootless/Dockerfile | 4 ++-- 28-rc/dind/Dockerfile | 8 ++++---- 28-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- .../windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index 6967b2cef..0fd9a0476 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.1.0-rc.1 +ENV DOCKER_VERSION 28.1.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile index 7ccbfa244..ea70eb9bb 100644 --- a/28-rc/dind-rootless/Dockerfile +++ b/28-rc/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/test/x86_64/docker-rootless-extras-28.1.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.1.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.1.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.1.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile index a0c77c808..26ef14f07 100644 --- a/28-rc/dind/Dockerfile +++ b/28-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile index 79a6d4664..d9d5bf64e 100644 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ b/28-rc/windows/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 28.1.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.1.zip +ENV DOCKER_VERSION 28.1.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.2.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/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 5bc558c39..8c4c2e335 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/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 28.1.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.1.zip +ENV DOCKER_VERSION 28.1.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.2.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/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index 7541e88b9..7400bb825 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/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 28.1.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.1.zip +ENV DOCKER_VERSION 28.1.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.2.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/versions.json b/versions.json index ba5c69cab..6c7b399c1 100644 --- a/versions.json +++ b/versions.json @@ -173,21 +173,21 @@ "28-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.1.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.1.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.1.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.1.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.2.zip" } }, "buildx": { @@ -339,6 +339,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "28.1.0-rc.1" + "version": "28.1.0-rc.2" } } From 45b29bee9e91e43e91181d5f51a2bb755961bab4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 17 Apr 2025 10:04:16 -0700 Subject: [PATCH 475/667] Update 28 to 28.1.0, compose 2.35.1 --- 28/cli/Dockerfile | 40 ++++++------ 28/dind-rootless/Dockerfile | 4 +- 28/dind/Dockerfile | 8 +-- 28/windows/windowsservercore-1809/Dockerfile | 10 +-- .../windowsservercore-ltsc2022/Dockerfile | 10 +-- .../windowsservercore-ltsc2025/Dockerfile | 10 +-- versions.json | 62 +++++++++---------- 7 files changed, 72 insertions(+), 72 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 3f949a1b5..9c55abbbe 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.0.4 +ENV DOCKER_VERSION 28.1.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.1.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.1.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.35.0 +ENV DOCKER_COMPOSE_VERSION 2.35.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-x86_64'; \ - sha256='dba1915cf2f282527f5df0cd7a94b9503047ed200317801853abe8f22c8cd493'; \ + url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-x86_64'; \ + sha256='7bdb2ce2916e5dd0354e5d129892bf96fdcdb1a9ab8eed69b9173e131db4c230'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv6'; \ - sha256='e7ea8760cb2b20808bdea94b15bccdd91b80045e3f0ae9efb7d4082ea1b98328'; \ + url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-armv6'; \ + sha256='dc555cf80a1c5849853a71083f4930790e6515d14c31060de77e6d83bbc996c3'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv7'; \ - sha256='9f9831ef951fbb1eaff7dfd17e4ca2e3522a9e66670e81075b68a25fbbfc0ee2'; \ + url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-armv7'; \ + sha256='50aba1c8fe1eb8efefede3dab9e6c2226ba756a5ffa5cf4f4f5baadaee9a7455'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-aarch64'; \ - sha256='a08457d837d5d4ed7c079f0721dc51ef3f21ce2d9654a6abd44944b74d975cd2'; \ + url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-aarch64'; \ + sha256='a91e930a076b91e6c69f11d1dbe3c06729ae765fb9dbb3f97cb808e784647399'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-ppc64le'; \ - sha256='7dfe56cde21ae0d4b96083629b5142b1f00b51baf6d3a695c0ac700822175b13'; \ + url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-ppc64le'; \ + sha256='fa6b67a69916a99d14191df5dee1e8399d5eb07f1d322f04caa2078045cb0140'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-riscv64'; \ - sha256='85ecd8c7ff0218a3b66a4ddcc3ef66d28b26ce9ec310531b56416cb8d6304b03'; \ + url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-riscv64'; \ + sha256='c582635c0c4fb1e692dd8a7de206373866f2aa3fcfd9cf03d2358585e602e15d'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-s390x'; \ - sha256='f9bc89ad8d048690f3cba9c05df5bddd9d0f5dcb03bfd41ceb613d7e560a76a0'; \ + url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-s390x'; \ + sha256='8cb63254106ceded2373a86355f48ea410564e748521a4b097e3d43b93c05e24'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index 1fa5a02b2..e8b9f48f3 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/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-28.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 9069f17ee..f122ac253 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.1.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.1.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 44465f007..5e4198009 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/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 28.0.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.4.zip +ENV DOCKER_VERSION 28.1.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.0.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) @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.35.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 +ENV DOCKER_COMPOSE_VERSION 2.35.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 971d6000e2c70da19c20f8264330a7ec3962b1fd59601afeb7e3636bad89b8c9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 412b2a4f1..0089aece8 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.0.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.4.zip +ENV DOCKER_VERSION 28.1.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.0.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) @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.35.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 +ENV DOCKER_COMPOSE_VERSION 2.35.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 971d6000e2c70da19c20f8264330a7ec3962b1fd59601afeb7e3636bad89b8c9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 6ac6a079c..1ba4763df 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.0.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.4.zip +ENV DOCKER_VERSION 28.1.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.0.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) @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.35.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 +ENV DOCKER_COMPOSE_VERSION 2.35.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 971d6000e2c70da19c20f8264330a7ec3962b1fd59601afeb7e3636bad89b8c9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6c7b399c1..d720b547e 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.0.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.1.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.1.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.1.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.1.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.0.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.1.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.1.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.0.4.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.1.0.zip" } }, "buildx": { @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "dba1915cf2f282527f5df0cd7a94b9503047ed200317801853abe8f22c8cd493", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-x86_64" + "sha256": "7bdb2ce2916e5dd0354e5d129892bf96fdcdb1a9ab8eed69b9173e131db4c230", + "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e7ea8760cb2b20808bdea94b15bccdd91b80045e3f0ae9efb7d4082ea1b98328", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv6" + "sha256": "dc555cf80a1c5849853a71083f4930790e6515d14c31060de77e6d83bbc996c3", + "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9f9831ef951fbb1eaff7dfd17e4ca2e3522a9e66670e81075b68a25fbbfc0ee2", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv7" + "sha256": "50aba1c8fe1eb8efefede3dab9e6c2226ba756a5ffa5cf4f4f5baadaee9a7455", + "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "a08457d837d5d4ed7c079f0721dc51ef3f21ce2d9654a6abd44944b74d975cd2", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-aarch64" + "sha256": "a91e930a076b91e6c69f11d1dbe3c06729ae765fb9dbb3f97cb808e784647399", + "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "3730e5cdebf017608dd25fe48539a87d66e7929ddd0f0682c3f02a5e907ca762", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-darwin-x86_64" + "sha256": "bb4e5b0ff79039f629efe9885ed0ca2f73f26ca4b67a0dfed0b6f160b60601f4", + "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "ba47fee03b234c5b41a0e872fc08b6820c26bb65869ac76a35e40516969f55d4", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-darwin-aarch64" + "sha256": "3a2150dc7ace0b55de7f97aa056ed15f1d44650bfbba9c505899cd507d8b8261", + "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "7dfe56cde21ae0d4b96083629b5142b1f00b51baf6d3a695c0ac700822175b13", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-ppc64le" + "sha256": "fa6b67a69916a99d14191df5dee1e8399d5eb07f1d322f04caa2078045cb0140", + "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "85ecd8c7ff0218a3b66a4ddcc3ef66d28b26ce9ec310531b56416cb8d6304b03", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-riscv64" + "sha256": "c582635c0c4fb1e692dd8a7de206373866f2aa3fcfd9cf03d2358585e602e15d", + "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "f9bc89ad8d048690f3cba9c05df5bddd9d0f5dcb03bfd41ceb613d7e560a76a0", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-s390x" + "sha256": "8cb63254106ceded2373a86355f48ea410564e748521a4b097e3d43b93c05e24", + "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe" + "sha256": "971d6000e2c70da19c20f8264330a7ec3962b1fd59601afeb7e3636bad89b8c9", + "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "857df8a710275345dca13f35be18a01fc866cb0a8bac284a4377e47ef4d2c783", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-aarch64.exe" + "sha256": "d44d3ef8a5c94985090d2d792dc386d80f3d9268bbcd068ede76c7ffd56e9b3c", + "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.35.0" + "version": "2.35.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ @@ -168,7 +168,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "28.0.4" + "version": "28.1.0" }, "28-rc": { "arches": { From fcd932d3b2d4c9be12eec9902d05b1f6ef6fe187 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 17 Apr 2025 10:06:16 -0700 Subject: [PATCH 476/667] Update 28-rc --- 28-rc/cli/Dockerfile | 167 ------------- 28-rc/cli/docker-entrypoint.sh | 61 ----- 28-rc/cli/modprobe.sh | 20 -- 28-rc/dind-rootless/Dockerfile | 54 ---- 28-rc/dind/Dockerfile | 108 -------- 28-rc/dind/dockerd-entrypoint.sh | 234 ------------------ .../windows/windowsservercore-1809/Dockerfile | 91 ------- .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 172 +------------ 10 files changed, 1 insertion(+), 1088 deletions(-) delete mode 100644 28-rc/cli/Dockerfile delete mode 100755 28-rc/cli/docker-entrypoint.sh delete mode 100755 28-rc/cli/modprobe.sh delete mode 100644 28-rc/dind-rootless/Dockerfile delete mode 100644 28-rc/dind/Dockerfile delete mode 100755 28-rc/dind/dockerd-entrypoint.sh delete mode 100644 28-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile deleted file mode 100644 index 0fd9a0476..000000000 --- a/28-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.21 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 28.1.0-rc.2 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.23.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64'; \ - sha256='55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6'; \ - sha256='0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7'; \ - sha256='3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64'; \ - sha256='50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le'; \ - sha256='d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64'; \ - sha256='3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x'; \ - sha256='e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.35.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-x86_64'; \ - sha256='dba1915cf2f282527f5df0cd7a94b9503047ed200317801853abe8f22c8cd493'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv6'; \ - sha256='e7ea8760cb2b20808bdea94b15bccdd91b80045e3f0ae9efb7d4082ea1b98328'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv7'; \ - sha256='9f9831ef951fbb1eaff7dfd17e4ca2e3522a9e66670e81075b68a25fbbfc0ee2'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-aarch64'; \ - sha256='a08457d837d5d4ed7c079f0721dc51ef3f21ce2d9654a6abd44944b74d975cd2'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-ppc64le'; \ - sha256='7dfe56cde21ae0d4b96083629b5142b1f00b51baf6d3a695c0ac700822175b13'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-riscv64'; \ - sha256='85ecd8c7ff0218a3b66a4ddcc3ef66d28b26ce9ec310531b56416cb8d6304b03'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-s390x'; \ - sha256='f9bc89ad8d048690f3cba9c05df5bddd9d0f5dcb03bfd41ceb613d7e560a76a0'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/28-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/28-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile deleted file mode 100644 index ea70eb9bb..000000000 --- a/28-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.1.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.1.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile deleted file mode 100644 index 26ef14f07..000000000 --- a/28-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 6c06bb811..000000000 --- a/28-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index d9d5bf64e..000000000 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.1.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.23.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.35.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 8c4c2e335..000000000 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.1.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.23.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.35.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index 7400bb825..000000000 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.1.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.23.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.35.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index d720b547e..ac26339c6 100644 --- a/versions.json +++ b/versions.json @@ -170,175 +170,5 @@ ], "version": "28.1.0" }, - "28-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.1.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.1.0-rc.2.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.1.0-rc.2.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.1.0-rc.2.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.1.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.1.0-rc.2.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.1.0-rc.2.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.23.0.linux-amd64", - "sha256": "55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.23.0.linux-arm-v6", - "sha256": "0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.23.0.linux-arm-v7", - "sha256": "3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.23.0.linux-arm64", - "sha256": "50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.23.0.freebsd-amd64", - "sha256": "973854d845a429cb00920ca7f2540d3185fb62512b57c2398d01694bea676571", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.23.0.freebsd-arm64", - "sha256": "4adbb6003c51f2da30d11857c6e8b6f037f2324bc21d926f24b83e13483a75f1", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.23.0.netbsd-amd64", - "sha256": "08aa01cf25d746fc9b15841ade4522a44c0dfb85e9616334d7452d802eef1f07", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.23.0.netbsd-arm64", - "sha256": "4a40a4d1e8b9fa055e74ff039fa088af01eb77df4adf2ceb6dadca60f6665a9f", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.23.0.openbsd-amd64", - "sha256": "25e346b3c0e5e2dbd0f98dd5e91189b78d71ef008c3c319745ef3b8874f4ec59", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.23.0.openbsd-arm64", - "sha256": "a009891b40e8c9e6d0ce38a477e60bf6124679b14266bdfca178f2ee4aa4161b", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.23.0.linux-ppc64le", - "sha256": "d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.23.0.linux-riscv64", - "sha256": "3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.23.0.linux-s390x", - "sha256": "e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.23.0.windows-amd64.exe", - "sha256": "ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.23.0.windows-arm64.exe", - "sha256": "ad405e9c287d2f58f178823fdf7cc79ed63b3b70129e9082a7cb702639bd80f6", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-arm64.exe" - } - }, - "version": "0.23.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "dba1915cf2f282527f5df0cd7a94b9503047ed200317801853abe8f22c8cd493", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "e7ea8760cb2b20808bdea94b15bccdd91b80045e3f0ae9efb7d4082ea1b98328", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "9f9831ef951fbb1eaff7dfd17e4ca2e3522a9e66670e81075b68a25fbbfc0ee2", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "a08457d837d5d4ed7c079f0721dc51ef3f21ce2d9654a6abd44944b74d975cd2", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "3730e5cdebf017608dd25fe48539a87d66e7929ddd0f0682c3f02a5e907ca762", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "ba47fee03b234c5b41a0e872fc08b6820c26bb65869ac76a35e40516969f55d4", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "7dfe56cde21ae0d4b96083629b5142b1f00b51baf6d3a695c0ac700822175b13", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "85ecd8c7ff0218a3b66a4ddcc3ef66d28b26ce9ec310531b56416cb8d6304b03", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "f9bc89ad8d048690f3cba9c05df5bddd9d0f5dcb03bfd41ceb613d7e560a76a0", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "bca44d55a7e612c53a80092661dd5db05aefb936e1eccd7ce06fdb02be7df3c3", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "857df8a710275345dca13f35be18a01fc866cb0a8bac284a4377e47ef4d2c783", - "url": "https://github.com/docker/compose/releases/download/v2.35.0/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.35.0" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "28.1.0-rc.2" - } + "28-rc": null } From 84fa8e735cf571bd16f439e8431ad23913dd19f4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 18 Apr 2025 10:04:15 -0700 Subject: [PATCH 477/667] Update 28 to 28.1.1 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-1809/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 9c55abbbe..92ddfb203 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.1.0 +ENV DOCKER_VERSION 28.1.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.1.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.1.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index e8b9f48f3..2f42d449a 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/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-28.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index f122ac253..58a1f6e66 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.1.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.1.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 5e4198009..2f9e278ba 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/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 28.1.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.0.zip +ENV DOCKER_VERSION 28.1.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.1.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/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 0089aece8..d5c2d9790 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.1.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.0.zip +ENV DOCKER_VERSION 28.1.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.1.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 1ba4763df..26df79aa7 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.1.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.0.zip +ENV DOCKER_VERSION 28.1.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.1.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/versions.json b/versions.json index ac26339c6..fa91886e2 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.1.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.1.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.1.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.1.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.1.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.1.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.1.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.1.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.1.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.1.1.zip" } }, "buildx": { @@ -168,7 +168,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "28.1.0" + "version": "28.1.1" }, "28-rc": null } From 3dba50562769bdfb0ed701bcfc2bbbde4304c72a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 7 May 2025 10:04:15 -0700 Subject: [PATCH 478/667] Update 28 to compose 2.36.0 --- 28/cli/Dockerfile | 30 ++++++------ 28/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 92ddfb203..b00d7affd 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.35.1 +ENV DOCKER_COMPOSE_VERSION 2.36.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-x86_64'; \ - sha256='7bdb2ce2916e5dd0354e5d129892bf96fdcdb1a9ab8eed69b9173e131db4c230'; \ + url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-x86_64'; \ + sha256='065ff3887656b88d475fd96d4bd8206ee484e31bbc2137ae5adfcd9e86eac602'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-armv6'; \ - sha256='dc555cf80a1c5849853a71083f4930790e6515d14c31060de77e6d83bbc996c3'; \ + url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-armv6'; \ + sha256='18c8d9a9689c14c8241e5e85c83e12d2bfe1f9789d8f250848e8494658eb6cfd'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-armv7'; \ - sha256='50aba1c8fe1eb8efefede3dab9e6c2226ba756a5ffa5cf4f4f5baadaee9a7455'; \ + url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-armv7'; \ + sha256='bb260fc8bbefe6165a210b4a78ff4eb8ebbc2f161994d77c5485abcd1d16af69'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-aarch64'; \ - sha256='a91e930a076b91e6c69f11d1dbe3c06729ae765fb9dbb3f97cb808e784647399'; \ + url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-aarch64'; \ + sha256='af9609273eb43a928323ed78e67b4064a1026b66b63a71e82fd100151b1d7b33'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-ppc64le'; \ - sha256='fa6b67a69916a99d14191df5dee1e8399d5eb07f1d322f04caa2078045cb0140'; \ + url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-ppc64le'; \ + sha256='7a82db14880db3acb614ce04fb76c0dea08679bc2dcb8c78d659b545320caed9'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-riscv64'; \ - sha256='c582635c0c4fb1e692dd8a7de206373866f2aa3fcfd9cf03d2358585e602e15d'; \ + url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-riscv64'; \ + sha256='7962891c67b4075f1a67836d0dddfe06173c501199d6e04b91105986b3c60655'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-s390x'; \ - sha256='8cb63254106ceded2373a86355f48ea410564e748521a4b097e3d43b93c05e24'; \ + url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-s390x'; \ + sha256='531a18e3cf937a8361a5aaf07f373074a9f7c901fee2ca2d6d00365fa710dde1'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 2f9e278ba..2a80823bc 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.35.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 971d6000e2c70da19c20f8264330a7ec3962b1fd59601afeb7e3636bad89b8c9 +ENV DOCKER_COMPOSE_VERSION 2.36.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 9916ce82e444bb68e539ab36b947c2edb95f74e5a640c2661255f2c340b5cfee RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index d5c2d9790..3e57900d6 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.35.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 971d6000e2c70da19c20f8264330a7ec3962b1fd59601afeb7e3636bad89b8c9 +ENV DOCKER_COMPOSE_VERSION 2.36.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 9916ce82e444bb68e539ab36b947c2edb95f74e5a640c2661255f2c340b5cfee RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 26df79aa7..b00eda8cc 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.35.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 971d6000e2c70da19c20f8264330a7ec3962b1fd59601afeb7e3636bad89b8c9 +ENV DOCKER_COMPOSE_VERSION 2.36.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 9916ce82e444bb68e539ab36b947c2edb95f74e5a640c2661255f2c340b5cfee RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index fa91886e2..f01f61745 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "7bdb2ce2916e5dd0354e5d129892bf96fdcdb1a9ab8eed69b9173e131db4c230", - "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-x86_64" + "sha256": "065ff3887656b88d475fd96d4bd8206ee484e31bbc2137ae5adfcd9e86eac602", + "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "dc555cf80a1c5849853a71083f4930790e6515d14c31060de77e6d83bbc996c3", - "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-armv6" + "sha256": "18c8d9a9689c14c8241e5e85c83e12d2bfe1f9789d8f250848e8494658eb6cfd", + "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "50aba1c8fe1eb8efefede3dab9e6c2226ba756a5ffa5cf4f4f5baadaee9a7455", - "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-armv7" + "sha256": "bb260fc8bbefe6165a210b4a78ff4eb8ebbc2f161994d77c5485abcd1d16af69", + "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "a91e930a076b91e6c69f11d1dbe3c06729ae765fb9dbb3f97cb808e784647399", - "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-aarch64" + "sha256": "af9609273eb43a928323ed78e67b4064a1026b66b63a71e82fd100151b1d7b33", + "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "bb4e5b0ff79039f629efe9885ed0ca2f73f26ca4b67a0dfed0b6f160b60601f4", - "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-darwin-x86_64" + "sha256": "0dc7ccd90eb7429a042f86d8455e2778e359c792efd229c44070808c75401096", + "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "3a2150dc7ace0b55de7f97aa056ed15f1d44650bfbba9c505899cd507d8b8261", - "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-darwin-aarch64" + "sha256": "79a877d91c5f89f41c8e68f554b92fa204eaec74105bb6ddc2cc46220bd18d3e", + "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "fa6b67a69916a99d14191df5dee1e8399d5eb07f1d322f04caa2078045cb0140", - "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-ppc64le" + "sha256": "7a82db14880db3acb614ce04fb76c0dea08679bc2dcb8c78d659b545320caed9", + "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "c582635c0c4fb1e692dd8a7de206373866f2aa3fcfd9cf03d2358585e602e15d", - "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-riscv64" + "sha256": "7962891c67b4075f1a67836d0dddfe06173c501199d6e04b91105986b3c60655", + "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "8cb63254106ceded2373a86355f48ea410564e748521a4b097e3d43b93c05e24", - "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-linux-s390x" + "sha256": "531a18e3cf937a8361a5aaf07f373074a9f7c901fee2ca2d6d00365fa710dde1", + "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "971d6000e2c70da19c20f8264330a7ec3962b1fd59601afeb7e3636bad89b8c9", - "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-windows-x86_64.exe" + "sha256": "9916ce82e444bb68e539ab36b947c2edb95f74e5a640c2661255f2c340b5cfee", + "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "d44d3ef8a5c94985090d2d792dc386d80f3d9268bbcd068ede76c7ffd56e9b3c", - "url": "https://github.com/docker/compose/releases/download/v2.35.1/docker-compose-windows-aarch64.exe" + "sha256": "01a14af95a24ab589faa12126f789d1ff49f515b3cd4cc12abd0724452ee90f3", + "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.35.1" + "version": "2.36.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From b5332f2d86b933dda2c753f9c0deb12c75f0c12e Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Mon, 19 May 2025 15:10:30 +0200 Subject: [PATCH 479/667] Add extendedKeyUsage = serverAuth to dind generated server cert Matches upstream documentation recommendations on https://docs.docker.com/engine/security/protect-access/#use-tls-https-to-protect-the-docker-daemon-socket --- 28/dind/dockerd-entrypoint.sh | 1 + dockerd-entrypoint.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/28/dind/dockerd-entrypoint.sh b/28/dind/dockerd-entrypoint.sh index 6c06bb811..bc66308ec 100755 --- a/28/dind/dockerd-entrypoint.sh +++ b/28/dind/dockerd-entrypoint.sh @@ -53,6 +53,7 @@ _tls_generate_certs() { -subj '/CN=docker:dind server' cat > "$dir/server/openssl.cnf" <<-EOF [ x509_exts ] + extendedKeyUsage = serverAuth subjectAltName = $(_tls_san) EOF openssl x509 -req \ diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 6c06bb811..bc66308ec 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -53,6 +53,7 @@ _tls_generate_certs() { -subj '/CN=docker:dind server' cat > "$dir/server/openssl.cnf" <<-EOF [ x509_exts ] + extendedKeyUsage = serverAuth subjectAltName = $(_tls_san) EOF openssl x509 -req \ From 52c8bfa9869c9c5605c6c03dc9a82cfe426ace77 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Mon, 19 May 2025 15:33:06 +0200 Subject: [PATCH 480/667] Add keyUsage extension to dind generated CA cert Required for compliance with X.509 RFCs --- 28/dind/dockerd-entrypoint.sh | 5 ++++- dockerd-entrypoint.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/28/dind/dockerd-entrypoint.sh b/28/dind/dockerd-entrypoint.sh index bc66308ec..8a291dfa5 100755 --- a/28/dind/dockerd-entrypoint.sh +++ b/28/dind/dockerd-entrypoint.sh @@ -41,7 +41,10 @@ _tls_generate_certs() { _tls_ensure_private "$dir/ca/key.pem" openssl req -new -key "$dir/ca/key.pem" \ -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign fi if [ -s "$dir/ca/key.pem" ]; then diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index bc66308ec..8a291dfa5 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -41,7 +41,10 @@ _tls_generate_certs() { _tls_ensure_private "$dir/ca/key.pem" openssl req -new -key "$dir/ca/key.pem" \ -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign fi if [ -s "$dir/ca/key.pem" ]; then From d370b5c8bac568d44d901ed2243868d61b48d3a4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 19 May 2025 10:04:15 -0700 Subject: [PATCH 481/667] Update 28 to compose 2.36.1 --- 28/cli/Dockerfile | 30 ++++++------ 28/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index b00d7affd..d1bc9cb8c 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.36.0 +ENV DOCKER_COMPOSE_VERSION 2.36.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-x86_64'; \ - sha256='065ff3887656b88d475fd96d4bd8206ee484e31bbc2137ae5adfcd9e86eac602'; \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-x86_64'; \ + sha256='8c410e789d3fa688201170a8efb52048ee0dcb0d4cde44ce92a1bb6949f49fcb'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-armv6'; \ - sha256='18c8d9a9689c14c8241e5e85c83e12d2bfe1f9789d8f250848e8494658eb6cfd'; \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv6'; \ + sha256='4726dc002180e66122087c4b48bc58c78a7cb97c92811ff2100296c73a426222'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-armv7'; \ - sha256='bb260fc8bbefe6165a210b4a78ff4eb8ebbc2f161994d77c5485abcd1d16af69'; \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv7'; \ + sha256='583299ca517b1d32cd9739b58e747770ce0e8a38cf72818d023fa5d6fb973098'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-aarch64'; \ - sha256='af9609273eb43a928323ed78e67b4064a1026b66b63a71e82fd100151b1d7b33'; \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-aarch64'; \ + sha256='a1ad63fe3f1feffb096df472bcd793e9635907a51e5861a0e0bf78b0c4fefa18'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-ppc64le'; \ - sha256='7a82db14880db3acb614ce04fb76c0dea08679bc2dcb8c78d659b545320caed9'; \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-ppc64le'; \ + sha256='7c208fb561bd5a7f79d16774b0b8f5c9da12f6dbe71601a8a40e4664da9ab822'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-riscv64'; \ - sha256='7962891c67b4075f1a67836d0dddfe06173c501199d6e04b91105986b3c60655'; \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-riscv64'; \ + sha256='c6de2c0d930ec37a4465ecb786aa59153fac518acbec37b5f92c23760fcb20a9'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-s390x'; \ - sha256='531a18e3cf937a8361a5aaf07f373074a9f7c901fee2ca2d6d00365fa710dde1'; \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-s390x'; \ + sha256='c06364ce6bcd14c2b8c7c595789249d2c041f0b79ff50f59356471f7fd938611'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 2a80823bc..d941f5016 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 9916ce82e444bb68e539ab36b947c2edb95f74e5a640c2661255f2c340b5cfee +ENV DOCKER_COMPOSE_VERSION 2.36.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 3e57900d6..4ae44f957 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 9916ce82e444bb68e539ab36b947c2edb95f74e5a640c2661255f2c340b5cfee +ENV DOCKER_COMPOSE_VERSION 2.36.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index b00eda8cc..3b7c9b5ce 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 9916ce82e444bb68e539ab36b947c2edb95f74e5a640c2661255f2c340b5cfee +ENV DOCKER_COMPOSE_VERSION 2.36.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f01f61745..8272ae3af 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "065ff3887656b88d475fd96d4bd8206ee484e31bbc2137ae5adfcd9e86eac602", - "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-x86_64" + "sha256": "8c410e789d3fa688201170a8efb52048ee0dcb0d4cde44ce92a1bb6949f49fcb", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "18c8d9a9689c14c8241e5e85c83e12d2bfe1f9789d8f250848e8494658eb6cfd", - "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-armv6" + "sha256": "4726dc002180e66122087c4b48bc58c78a7cb97c92811ff2100296c73a426222", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "bb260fc8bbefe6165a210b4a78ff4eb8ebbc2f161994d77c5485abcd1d16af69", - "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-armv7" + "sha256": "583299ca517b1d32cd9739b58e747770ce0e8a38cf72818d023fa5d6fb973098", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "af9609273eb43a928323ed78e67b4064a1026b66b63a71e82fd100151b1d7b33", - "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-aarch64" + "sha256": "a1ad63fe3f1feffb096df472bcd793e9635907a51e5861a0e0bf78b0c4fefa18", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "0dc7ccd90eb7429a042f86d8455e2778e359c792efd229c44070808c75401096", - "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-darwin-x86_64" + "sha256": "3efe32353e5b9289d9061b3b504eba9621d091d3ea4dfc32569294e7e643ff95", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "79a877d91c5f89f41c8e68f554b92fa204eaec74105bb6ddc2cc46220bd18d3e", - "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-darwin-aarch64" + "sha256": "aa64dd4da992bea5f35be83a99b79fc49e37062e7f006010e078f79632c16223", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "7a82db14880db3acb614ce04fb76c0dea08679bc2dcb8c78d659b545320caed9", - "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-ppc64le" + "sha256": "7c208fb561bd5a7f79d16774b0b8f5c9da12f6dbe71601a8a40e4664da9ab822", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "7962891c67b4075f1a67836d0dddfe06173c501199d6e04b91105986b3c60655", - "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-riscv64" + "sha256": "c6de2c0d930ec37a4465ecb786aa59153fac518acbec37b5f92c23760fcb20a9", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "531a18e3cf937a8361a5aaf07f373074a9f7c901fee2ca2d6d00365fa710dde1", - "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-linux-s390x" + "sha256": "c06364ce6bcd14c2b8c7c595789249d2c041f0b79ff50f59356471f7fd938611", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "9916ce82e444bb68e539ab36b947c2edb95f74e5a640c2661255f2c340b5cfee", - "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-windows-x86_64.exe" + "sha256": "0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "01a14af95a24ab589faa12126f789d1ff49f515b3cd4cc12abd0724452ee90f3", - "url": "https://github.com/docker/compose/releases/download/v2.36.0/docker-compose-windows-aarch64.exe" + "sha256": "c87629502d5da6ffbfce4b72384f486bd562db3f1f583d7613422c17b899675f", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.36.0" + "version": "2.36.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 8daf44089ceb1c4996c1985f1ae6a17a70d52dfc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 19 May 2025 16:04:25 -0700 Subject: [PATCH 482/667] Update 28-rc to 28.2.0-rc.1, buildx 0.23.0, compose 2.36.1 --- 28-rc/cli/Dockerfile | 167 +++++++++++++ 28-rc/cli/docker-entrypoint.sh | 61 +++++ 28-rc/cli/modprobe.sh | 20 ++ 28-rc/dind-rootless/Dockerfile | 54 ++++ 28-rc/dind/Dockerfile | 108 ++++++++ 28-rc/dind/dockerd-entrypoint.sh | 234 ++++++++++++++++++ .../windows/windowsservercore-1809/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 172 ++++++++++++- 10 files changed, 1088 insertions(+), 1 deletion(-) create mode 100644 28-rc/cli/Dockerfile create mode 100755 28-rc/cli/docker-entrypoint.sh create mode 100755 28-rc/cli/modprobe.sh create mode 100644 28-rc/dind-rootless/Dockerfile create mode 100644 28-rc/dind/Dockerfile create mode 100755 28-rc/dind/dockerd-entrypoint.sh create mode 100644 28-rc/windows/windowsservercore-1809/Dockerfile create mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile new file mode 100644 index 000000000..1c858b3d4 --- /dev/null +++ b/28-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.21 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 28.2.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.23.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64'; \ + sha256='55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6'; \ + sha256='0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7'; \ + sha256='3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64'; \ + sha256='50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le'; \ + sha256='d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64'; \ + sha256='3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x'; \ + sha256='e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.36.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-x86_64'; \ + sha256='8c410e789d3fa688201170a8efb52048ee0dcb0d4cde44ce92a1bb6949f49fcb'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv6'; \ + sha256='4726dc002180e66122087c4b48bc58c78a7cb97c92811ff2100296c73a426222'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv7'; \ + sha256='583299ca517b1d32cd9739b58e747770ce0e8a38cf72818d023fa5d6fb973098'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-aarch64'; \ + sha256='a1ad63fe3f1feffb096df472bcd793e9635907a51e5861a0e0bf78b0c4fefa18'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-ppc64le'; \ + sha256='7c208fb561bd5a7f79d16774b0b8f5c9da12f6dbe71601a8a40e4664da9ab822'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-riscv64'; \ + sha256='c6de2c0d930ec37a4465ecb786aa59153fac518acbec37b5f92c23760fcb20a9'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-s390x'; \ + sha256='c06364ce6bcd14c2b8c7c595789249d2c041f0b79ff50f59356471f7fd938611'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/28-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/28-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..be59a39af --- /dev/null +++ b/28-rc/dind-rootless/Dockerfile @@ -0,0 +1,54 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.2.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.2.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile new file mode 100644 index 000000000..202ee98e6 --- /dev/null +++ b/28-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..6c06bb811 --- /dev/null +++ b/28-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,234 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile new file mode 100644 index 000000000..ffbab9e87 --- /dev/null +++ b/28-rc/windows/windowsservercore-1809/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:1809 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.2.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.23.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.36.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..47df4a403 --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.2.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.23.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.36.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..93f768e06 --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.2.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.23.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.36.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 8272ae3af..7cea9a675 100644 --- a/versions.json +++ b/versions.json @@ -170,5 +170,175 @@ ], "version": "28.1.1" }, - "28-rc": null + "28-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.2.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.2.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.23.0.linux-amd64", + "sha256": "55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.23.0.linux-arm-v6", + "sha256": "0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.23.0.linux-arm-v7", + "sha256": "3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.23.0.linux-arm64", + "sha256": "50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.23.0.freebsd-amd64", + "sha256": "973854d845a429cb00920ca7f2540d3185fb62512b57c2398d01694bea676571", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.23.0.freebsd-arm64", + "sha256": "4adbb6003c51f2da30d11857c6e8b6f037f2324bc21d926f24b83e13483a75f1", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.23.0.netbsd-amd64", + "sha256": "08aa01cf25d746fc9b15841ade4522a44c0dfb85e9616334d7452d802eef1f07", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.23.0.netbsd-arm64", + "sha256": "4a40a4d1e8b9fa055e74ff039fa088af01eb77df4adf2ceb6dadca60f6665a9f", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.23.0.openbsd-amd64", + "sha256": "25e346b3c0e5e2dbd0f98dd5e91189b78d71ef008c3c319745ef3b8874f4ec59", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.23.0.openbsd-arm64", + "sha256": "a009891b40e8c9e6d0ce38a477e60bf6124679b14266bdfca178f2ee4aa4161b", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.23.0.linux-ppc64le", + "sha256": "d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.23.0.linux-riscv64", + "sha256": "3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.23.0.linux-s390x", + "sha256": "e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.23.0.windows-amd64.exe", + "sha256": "ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.23.0.windows-arm64.exe", + "sha256": "ad405e9c287d2f58f178823fdf7cc79ed63b3b70129e9082a7cb702639bd80f6", + "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-arm64.exe" + } + }, + "version": "0.23.0" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "8c410e789d3fa688201170a8efb52048ee0dcb0d4cde44ce92a1bb6949f49fcb", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "4726dc002180e66122087c4b48bc58c78a7cb97c92811ff2100296c73a426222", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "583299ca517b1d32cd9739b58e747770ce0e8a38cf72818d023fa5d6fb973098", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "a1ad63fe3f1feffb096df472bcd793e9635907a51e5861a0e0bf78b0c4fefa18", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "3efe32353e5b9289d9061b3b504eba9621d091d3ea4dfc32569294e7e643ff95", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "aa64dd4da992bea5f35be83a99b79fc49e37062e7f006010e078f79632c16223", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "7c208fb561bd5a7f79d16774b0b8f5c9da12f6dbe71601a8a40e4664da9ab822", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "c6de2c0d930ec37a4465ecb786aa59153fac518acbec37b5f92c23760fcb20a9", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "c06364ce6bcd14c2b8c7c595789249d2c041f0b79ff50f59356471f7fd938611", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "c87629502d5da6ffbfce4b72384f486bd562db3f1f583d7613422c17b899675f", + "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.36.1" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022", + "windows/windowsservercore-1809" + ], + "version": "28.2.0-rc.1" + } } From 861512c7e2e4945f0878d043e55262dd330843a4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 19 May 2025 16:19:20 -0700 Subject: [PATCH 483/667] Update 28-rc --- 28-rc/dind/dockerd-entrypoint.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh index 6c06bb811..8a291dfa5 100755 --- a/28-rc/dind/dockerd-entrypoint.sh +++ b/28-rc/dind/dockerd-entrypoint.sh @@ -41,7 +41,10 @@ _tls_generate_certs() { _tls_ensure_private "$dir/ca/key.pem" openssl req -new -key "$dir/ca/key.pem" \ -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' -x509 -days "$certValidDays" + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign fi if [ -s "$dir/ca/key.pem" ]; then @@ -53,6 +56,7 @@ _tls_generate_certs() { -subj '/CN=docker:dind server' cat > "$dir/server/openssl.cnf" <<-EOF [ x509_exts ] + extendedKeyUsage = serverAuth subjectAltName = $(_tls_san) EOF openssl x509 -req \ From fc3431ce388e6622936952b0d2e54b28d3488edd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 21 May 2025 10:04:17 -0700 Subject: [PATCH 484/667] Update 28 to buildx 0.24.0 --- 28/cli/Dockerfile | 30 +++--- 28/windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 5 files changed, 70 insertions(+), 70 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index d1bc9cb8c..dbeac2fa2 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.23.0 +ENV DOCKER_BUILDX_VERSION 0.24.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64'; \ - sha256='55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64'; \ + sha256='c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6'; \ - sha256='0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6'; \ + sha256='591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7'; \ - sha256='3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7'; \ + sha256='69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64'; \ - sha256='50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64'; \ + sha256='ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le'; \ - sha256='d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le'; \ + sha256='90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64'; \ - sha256='3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64'; \ + sha256='3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x'; \ - sha256='e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x'; \ + sha256='821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index d941f5016..8fb5630cb 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.23.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 +ENV DOCKER_BUILDX_VERSION 0.24.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 4ae44f957..35749c810 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.23.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 +ENV DOCKER_BUILDX_VERSION 0.24.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 3b7c9b5ce..d5f568657 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.23.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 +ENV DOCKER_BUILDX_VERSION 0.24.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 7cea9a675..7f9498618 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.23.0.linux-amd64", - "sha256": "55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64" + "file": "buildx-v0.24.0.linux-amd64", + "sha256": "c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.23.0.linux-arm-v6", - "sha256": "0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6" + "file": "buildx-v0.24.0.linux-arm-v6", + "sha256": "591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.23.0.linux-arm-v7", - "sha256": "3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7" + "file": "buildx-v0.24.0.linux-arm-v7", + "sha256": "69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.23.0.linux-arm64", - "sha256": "50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64" + "file": "buildx-v0.24.0.linux-arm64", + "sha256": "ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.23.0.freebsd-amd64", - "sha256": "973854d845a429cb00920ca7f2540d3185fb62512b57c2398d01694bea676571", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-amd64" + "file": "buildx-v0.24.0.freebsd-amd64", + "sha256": "889224cf7885ab6b1890c5019fe798021827ac73cfa6c8f1931418e09a4d8a18", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.23.0.freebsd-arm64", - "sha256": "4adbb6003c51f2da30d11857c6e8b6f037f2324bc21d926f24b83e13483a75f1", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-arm64" + "file": "buildx-v0.24.0.freebsd-arm64", + "sha256": "2850060b31468f928cd34a25aa65725944f8969e4d09715499333f063a2f9bca", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.23.0.netbsd-amd64", - "sha256": "08aa01cf25d746fc9b15841ade4522a44c0dfb85e9616334d7452d802eef1f07", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-amd64" + "file": "buildx-v0.24.0.netbsd-amd64", + "sha256": "2e83d94835a1a19ff90c5a83e4039b445f8e3e1fc13d447a643d87cbbf2645aa", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.23.0.netbsd-arm64", - "sha256": "4a40a4d1e8b9fa055e74ff039fa088af01eb77df4adf2ceb6dadca60f6665a9f", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-arm64" + "file": "buildx-v0.24.0.netbsd-arm64", + "sha256": "53964d5bfa7b4ed5977f0980f41a365f05808e98c674ce245692409c03897381", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.23.0.openbsd-amd64", - "sha256": "25e346b3c0e5e2dbd0f98dd5e91189b78d71ef008c3c319745ef3b8874f4ec59", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-amd64" + "file": "buildx-v0.24.0.openbsd-amd64", + "sha256": "995c03911b43075a84c6310a0cf40d35f3752787e3bec8bb763f048d2036385c", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.23.0.openbsd-arm64", - "sha256": "a009891b40e8c9e6d0ce38a477e60bf6124679b14266bdfca178f2ee4aa4161b", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-arm64" + "file": "buildx-v0.24.0.openbsd-arm64", + "sha256": "9647a7d528058673ba26acf7d146e253fe2f6029c9a21e73b660659d6e4918b8", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.23.0.linux-ppc64le", - "sha256": "d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le" + "file": "buildx-v0.24.0.linux-ppc64le", + "sha256": "90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.23.0.linux-riscv64", - "sha256": "3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64" + "file": "buildx-v0.24.0.linux-riscv64", + "sha256": "3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.23.0.linux-s390x", - "sha256": "e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x" + "file": "buildx-v0.24.0.linux-s390x", + "sha256": "821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.23.0.windows-amd64.exe", - "sha256": "ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe" + "file": "buildx-v0.24.0.windows-amd64.exe", + "sha256": "8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.23.0.windows-arm64.exe", - "sha256": "ad405e9c287d2f58f178823fdf7cc79ed63b3b70129e9082a7cb702639bd80f6", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-arm64.exe" + "file": "buildx-v0.24.0.windows-arm64.exe", + "sha256": "fc0cd1fa1594ad6e0fc907a6f00b618ede1a3958ccc4ddf324dea3500946e046", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-arm64.exe" } }, - "version": "0.23.0" + "version": "0.24.0" }, "compose": { "arches": { From a89fda523324cef5da11eed61c397347e1435edd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 21 May 2025 10:06:18 -0700 Subject: [PATCH 485/667] Update 28-rc to buildx 0.24.0 --- 28-rc/cli/Dockerfile | 30 +++--- .../windows/windowsservercore-1809/Dockerfile | 6 +- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 5 files changed, 70 insertions(+), 70 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index 1c858b3d4..e8f9f2ba0 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.23.0 +ENV DOCKER_BUILDX_VERSION 0.24.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64'; \ - sha256='55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64'; \ + sha256='c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6'; \ - sha256='0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6'; \ + sha256='591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7'; \ - sha256='3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7'; \ + sha256='69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64'; \ - sha256='50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64'; \ + sha256='ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le'; \ - sha256='d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le'; \ + sha256='90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64'; \ - sha256='3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64'; \ + sha256='3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x'; \ - sha256='e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717'; \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x'; \ + sha256='821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile index ffbab9e87..c01bce638 100644 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ b/28-rc/windows/windowsservercore-1809/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.23.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 +ENV DOCKER_BUILDX_VERSION 0.24.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 47df4a403..ef3dbeae6 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.23.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 +ENV DOCKER_BUILDX_VERSION 0.24.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index 93f768e06..0cba51008 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.23.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0 +ENV DOCKER_BUILDX_VERSION 0.24.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 7f9498618..cd4ea7d49 100644 --- a/versions.json +++ b/versions.json @@ -193,82 +193,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.23.0.linux-amd64", - "sha256": "55838fdd095084e158e06a63635a07fe8a8bc6cb4db507f203394dc1ffa7fb8b", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-amd64" + "file": "buildx-v0.24.0.linux-amd64", + "sha256": "c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.23.0.linux-arm-v6", - "sha256": "0a74f020bf67c22b8564c93ac84b393cc8c3d319fc210779dfe9b2594422a5e9", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v6" + "file": "buildx-v0.24.0.linux-arm-v6", + "sha256": "591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.23.0.linux-arm-v7", - "sha256": "3ab9d3838aedce5ec6ecaecb85e664689d57292d19a6ddca9fb31f0950259ce6", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm-v7" + "file": "buildx-v0.24.0.linux-arm-v7", + "sha256": "69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.23.0.linux-arm64", - "sha256": "50b0b14770127b292e3e2f756d0137152b08afc1d7daa09f49d2b6e6fa1b1b81", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-arm64" + "file": "buildx-v0.24.0.linux-arm64", + "sha256": "ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.23.0.freebsd-amd64", - "sha256": "973854d845a429cb00920ca7f2540d3185fb62512b57c2398d01694bea676571", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-amd64" + "file": "buildx-v0.24.0.freebsd-amd64", + "sha256": "889224cf7885ab6b1890c5019fe798021827ac73cfa6c8f1931418e09a4d8a18", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.23.0.freebsd-arm64", - "sha256": "4adbb6003c51f2da30d11857c6e8b6f037f2324bc21d926f24b83e13483a75f1", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.freebsd-arm64" + "file": "buildx-v0.24.0.freebsd-arm64", + "sha256": "2850060b31468f928cd34a25aa65725944f8969e4d09715499333f063a2f9bca", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.23.0.netbsd-amd64", - "sha256": "08aa01cf25d746fc9b15841ade4522a44c0dfb85e9616334d7452d802eef1f07", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-amd64" + "file": "buildx-v0.24.0.netbsd-amd64", + "sha256": "2e83d94835a1a19ff90c5a83e4039b445f8e3e1fc13d447a643d87cbbf2645aa", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.23.0.netbsd-arm64", - "sha256": "4a40a4d1e8b9fa055e74ff039fa088af01eb77df4adf2ceb6dadca60f6665a9f", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.netbsd-arm64" + "file": "buildx-v0.24.0.netbsd-arm64", + "sha256": "53964d5bfa7b4ed5977f0980f41a365f05808e98c674ce245692409c03897381", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.23.0.openbsd-amd64", - "sha256": "25e346b3c0e5e2dbd0f98dd5e91189b78d71ef008c3c319745ef3b8874f4ec59", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-amd64" + "file": "buildx-v0.24.0.openbsd-amd64", + "sha256": "995c03911b43075a84c6310a0cf40d35f3752787e3bec8bb763f048d2036385c", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.23.0.openbsd-arm64", - "sha256": "a009891b40e8c9e6d0ce38a477e60bf6124679b14266bdfca178f2ee4aa4161b", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.openbsd-arm64" + "file": "buildx-v0.24.0.openbsd-arm64", + "sha256": "9647a7d528058673ba26acf7d146e253fe2f6029c9a21e73b660659d6e4918b8", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.23.0.linux-ppc64le", - "sha256": "d7251d345225a7ab908b96010447d98767174ded277979cc10280ba1d31d8cf6", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-ppc64le" + "file": "buildx-v0.24.0.linux-ppc64le", + "sha256": "90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.23.0.linux-riscv64", - "sha256": "3c225413839ec1bd84a0fdc21614046e4fdaa2afe6bbb9057c75a024f520d5a8", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-riscv64" + "file": "buildx-v0.24.0.linux-riscv64", + "sha256": "3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.23.0.linux-s390x", - "sha256": "e4a662893ac1983b1298569959b2e2c4b9dcf6c9d589fb00997926971853c717", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.linux-s390x" + "file": "buildx-v0.24.0.linux-s390x", + "sha256": "821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.23.0.windows-amd64.exe", - "sha256": "ba6f6ac5abbbf2e9a222fc0332b9f101f0709ced48cecb25147ddb3d143067c0", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-amd64.exe" + "file": "buildx-v0.24.0.windows-amd64.exe", + "sha256": "8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.23.0.windows-arm64.exe", - "sha256": "ad405e9c287d2f58f178823fdf7cc79ed63b3b70129e9082a7cb702639bd80f6", - "url": "https://github.com/docker/buildx/releases/download/v0.23.0/buildx-v0.23.0.windows-arm64.exe" + "file": "buildx-v0.24.0.windows-arm64.exe", + "sha256": "fc0cd1fa1594ad6e0fc907a6f00b618ede1a3958ccc4ddf324dea3500946e046", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-arm64.exe" } }, - "version": "0.23.0" + "version": "0.24.0" }, "compose": { "arches": { From fd9ffd927316fe34adddaa0e1fccd65307b09e2c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 23 May 2025 10:04:14 -0700 Subject: [PATCH 486/667] Update 28 to compose 2.36.2 --- 28/cli/Dockerfile | 30 ++++++------ 28/windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index dbeac2fa2..bbcc6e9f8 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.36.1 +ENV DOCKER_COMPOSE_VERSION 2.36.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-x86_64'; \ - sha256='8c410e789d3fa688201170a8efb52048ee0dcb0d4cde44ce92a1bb6949f49fcb'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-x86_64'; \ + sha256='9040bd35b2cc0783ce6c5de491de7e52e24d4137dbfc5de8a524f718fc23556c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv6'; \ - sha256='4726dc002180e66122087c4b48bc58c78a7cb97c92811ff2100296c73a426222'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv6'; \ + sha256='8260c11228337291dd2adcc1ee957756581047c5f40ad5ff6917660e8ebe7e61'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv7'; \ - sha256='583299ca517b1d32cd9739b58e747770ce0e8a38cf72818d023fa5d6fb973098'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv7'; \ + sha256='9e9d20ebc4a094ee7788fbb5bddf70b0b319a55eee134db195d1e47f078ae0dc'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-aarch64'; \ - sha256='a1ad63fe3f1feffb096df472bcd793e9635907a51e5861a0e0bf78b0c4fefa18'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-aarch64'; \ + sha256='d1148609319706a57b755ff0f61d604a63a8cf57adb24c17535baa766ff14b4f'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-ppc64le'; \ - sha256='7c208fb561bd5a7f79d16774b0b8f5c9da12f6dbe71601a8a40e4664da9ab822'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-ppc64le'; \ + sha256='14b5db45d45808ece42066e4c978a6dddeb0c7ceffd656abfcb8182515fb9c7c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-riscv64'; \ - sha256='c6de2c0d930ec37a4465ecb786aa59153fac518acbec37b5f92c23760fcb20a9'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-riscv64'; \ + sha256='17b86e88985f7ac6f282ea36e585d15a586584bc4f853466f92a9aed031772ed'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-s390x'; \ - sha256='c06364ce6bcd14c2b8c7c595789249d2c041f0b79ff50f59356471f7fd938611'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-s390x'; \ + sha256='65fe31a89326fb6de9f0e0c93c9abb0e88e407febc16b3551b92507e1ffbc965'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 8fb5630cb..33b16fe4b 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 +ENV DOCKER_COMPOSE_VERSION 2.36.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 35749c810..4c58243d5 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 +ENV DOCKER_COMPOSE_VERSION 2.36.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index d5f568657..d751d03d2 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 +ENV DOCKER_COMPOSE_VERSION 2.36.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index cd4ea7d49..ae7f71c8a 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "8c410e789d3fa688201170a8efb52048ee0dcb0d4cde44ce92a1bb6949f49fcb", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-x86_64" + "sha256": "9040bd35b2cc0783ce6c5de491de7e52e24d4137dbfc5de8a524f718fc23556c", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4726dc002180e66122087c4b48bc58c78a7cb97c92811ff2100296c73a426222", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv6" + "sha256": "8260c11228337291dd2adcc1ee957756581047c5f40ad5ff6917660e8ebe7e61", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "583299ca517b1d32cd9739b58e747770ce0e8a38cf72818d023fa5d6fb973098", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv7" + "sha256": "9e9d20ebc4a094ee7788fbb5bddf70b0b319a55eee134db195d1e47f078ae0dc", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "a1ad63fe3f1feffb096df472bcd793e9635907a51e5861a0e0bf78b0c4fefa18", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-aarch64" + "sha256": "d1148609319706a57b755ff0f61d604a63a8cf57adb24c17535baa766ff14b4f", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "3efe32353e5b9289d9061b3b504eba9621d091d3ea4dfc32569294e7e643ff95", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-darwin-x86_64" + "sha256": "e4479c44049f02e85b45cda129fd4edb1f389ebee894a1dc15a153898b87a160", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "aa64dd4da992bea5f35be83a99b79fc49e37062e7f006010e078f79632c16223", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-darwin-aarch64" + "sha256": "065c65ec0dd579a82854fff9a8841f5be139362371d3cd5cf26cfdc953dbbbf3", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "7c208fb561bd5a7f79d16774b0b8f5c9da12f6dbe71601a8a40e4664da9ab822", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-ppc64le" + "sha256": "14b5db45d45808ece42066e4c978a6dddeb0c7ceffd656abfcb8182515fb9c7c", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "c6de2c0d930ec37a4465ecb786aa59153fac518acbec37b5f92c23760fcb20a9", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-riscv64" + "sha256": "17b86e88985f7ac6f282ea36e585d15a586584bc4f853466f92a9aed031772ed", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "c06364ce6bcd14c2b8c7c595789249d2c041f0b79ff50f59356471f7fd938611", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-s390x" + "sha256": "65fe31a89326fb6de9f0e0c93c9abb0e88e407febc16b3551b92507e1ffbc965", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe" + "sha256": "82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "c87629502d5da6ffbfce4b72384f486bd562db3f1f583d7613422c17b899675f", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-aarch64.exe" + "sha256": "c838e1f14dcb50b11498cc7e00b2faeb7816f422776d2800a62e47e039f56dad", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.36.1" + "version": "2.36.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 0dcbded97a8c1fc306c5325566cbedb5b164955b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 23 May 2025 10:05:58 -0700 Subject: [PATCH 487/667] Update 28-rc to compose 2.36.2 --- 28-rc/cli/Dockerfile | 30 ++++++------ .../windows/windowsservercore-1809/Dockerfile | 6 +-- .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index e8f9f2ba0..8afd4ff40 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.36.1 +ENV DOCKER_COMPOSE_VERSION 2.36.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-x86_64'; \ - sha256='8c410e789d3fa688201170a8efb52048ee0dcb0d4cde44ce92a1bb6949f49fcb'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-x86_64'; \ + sha256='9040bd35b2cc0783ce6c5de491de7e52e24d4137dbfc5de8a524f718fc23556c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv6'; \ - sha256='4726dc002180e66122087c4b48bc58c78a7cb97c92811ff2100296c73a426222'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv6'; \ + sha256='8260c11228337291dd2adcc1ee957756581047c5f40ad5ff6917660e8ebe7e61'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv7'; \ - sha256='583299ca517b1d32cd9739b58e747770ce0e8a38cf72818d023fa5d6fb973098'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv7'; \ + sha256='9e9d20ebc4a094ee7788fbb5bddf70b0b319a55eee134db195d1e47f078ae0dc'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-aarch64'; \ - sha256='a1ad63fe3f1feffb096df472bcd793e9635907a51e5861a0e0bf78b0c4fefa18'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-aarch64'; \ + sha256='d1148609319706a57b755ff0f61d604a63a8cf57adb24c17535baa766ff14b4f'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-ppc64le'; \ - sha256='7c208fb561bd5a7f79d16774b0b8f5c9da12f6dbe71601a8a40e4664da9ab822'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-ppc64le'; \ + sha256='14b5db45d45808ece42066e4c978a6dddeb0c7ceffd656abfcb8182515fb9c7c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-riscv64'; \ - sha256='c6de2c0d930ec37a4465ecb786aa59153fac518acbec37b5f92c23760fcb20a9'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-riscv64'; \ + sha256='17b86e88985f7ac6f282ea36e585d15a586584bc4f853466f92a9aed031772ed'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-s390x'; \ - sha256='c06364ce6bcd14c2b8c7c595789249d2c041f0b79ff50f59356471f7fd938611'; \ + url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-s390x'; \ + sha256='65fe31a89326fb6de9f0e0c93c9abb0e88e407febc16b3551b92507e1ffbc965'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile index c01bce638..193738181 100644 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ b/28-rc/windows/windowsservercore-1809/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 +ENV DOCKER_COMPOSE_VERSION 2.36.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index ef3dbeae6..670cea476 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 +ENV DOCKER_COMPOSE_VERSION 2.36.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index 0cba51008..3255b165b 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704 +ENV DOCKER_COMPOSE_VERSION 2.36.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ae7f71c8a..ef3359c59 100644 --- a/versions.json +++ b/versions.json @@ -274,61 +274,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "8c410e789d3fa688201170a8efb52048ee0dcb0d4cde44ce92a1bb6949f49fcb", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-x86_64" + "sha256": "9040bd35b2cc0783ce6c5de491de7e52e24d4137dbfc5de8a524f718fc23556c", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "4726dc002180e66122087c4b48bc58c78a7cb97c92811ff2100296c73a426222", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv6" + "sha256": "8260c11228337291dd2adcc1ee957756581047c5f40ad5ff6917660e8ebe7e61", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "583299ca517b1d32cd9739b58e747770ce0e8a38cf72818d023fa5d6fb973098", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-armv7" + "sha256": "9e9d20ebc4a094ee7788fbb5bddf70b0b319a55eee134db195d1e47f078ae0dc", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "a1ad63fe3f1feffb096df472bcd793e9635907a51e5861a0e0bf78b0c4fefa18", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-aarch64" + "sha256": "d1148609319706a57b755ff0f61d604a63a8cf57adb24c17535baa766ff14b4f", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "3efe32353e5b9289d9061b3b504eba9621d091d3ea4dfc32569294e7e643ff95", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-darwin-x86_64" + "sha256": "e4479c44049f02e85b45cda129fd4edb1f389ebee894a1dc15a153898b87a160", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "aa64dd4da992bea5f35be83a99b79fc49e37062e7f006010e078f79632c16223", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-darwin-aarch64" + "sha256": "065c65ec0dd579a82854fff9a8841f5be139362371d3cd5cf26cfdc953dbbbf3", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "7c208fb561bd5a7f79d16774b0b8f5c9da12f6dbe71601a8a40e4664da9ab822", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-ppc64le" + "sha256": "14b5db45d45808ece42066e4c978a6dddeb0c7ceffd656abfcb8182515fb9c7c", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "c6de2c0d930ec37a4465ecb786aa59153fac518acbec37b5f92c23760fcb20a9", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-riscv64" + "sha256": "17b86e88985f7ac6f282ea36e585d15a586584bc4f853466f92a9aed031772ed", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "c06364ce6bcd14c2b8c7c595789249d2c041f0b79ff50f59356471f7fd938611", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-linux-s390x" + "sha256": "65fe31a89326fb6de9f0e0c93c9abb0e88e407febc16b3551b92507e1ffbc965", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "0291c2f108655128dc36005d0c703869d9d98a1d403ed9bb8719356b9e5f2704", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-x86_64.exe" + "sha256": "82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "c87629502d5da6ffbfce4b72384f486bd562db3f1f583d7613422c17b899675f", - "url": "https://github.com/docker/compose/releases/download/v2.36.1/docker-compose-windows-aarch64.exe" + "sha256": "c838e1f14dcb50b11498cc7e00b2faeb7816f422776d2800a62e47e039f56dad", + "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.36.1" + "version": "2.36.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From e3927bb31eb6732adf3837a3e99200fb63b55f66 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 23 May 2025 16:04:23 -0700 Subject: [PATCH 488/667] Update 28-rc to 28.2.0-rc.2 --- 28-rc/cli/Dockerfile | 10 +++++----- 28-rc/dind-rootless/Dockerfile | 4 ++-- 28-rc/dind/Dockerfile | 8 ++++---- 28-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- .../windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index 8afd4ff40..e13db5b42 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.2.0-rc.1 +ENV DOCKER_VERSION 28.2.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile index be59a39af..250f7a9a4 100644 --- a/28-rc/dind-rootless/Dockerfile +++ b/28-rc/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/test/x86_64/docker-rootless-extras-28.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.2.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.2.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile index 202ee98e6..4ce2c3668 100644 --- a/28-rc/dind/Dockerfile +++ b/28-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile index 193738181..47a37be13 100644 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ b/28-rc/windows/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 28.2.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.1.zip +ENV DOCKER_VERSION 28.2.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.2.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/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 670cea476..ff8ff1ea9 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/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 28.2.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.1.zip +ENV DOCKER_VERSION 28.2.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.2.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/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index 3255b165b..b25f55f83 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/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 28.2.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.1.zip +ENV DOCKER_VERSION 28.2.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.2.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/versions.json b/versions.json index ef3359c59..117cf8a23 100644 --- a/versions.json +++ b/versions.json @@ -173,21 +173,21 @@ "28-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.2.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.2.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.2.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.2.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.2.zip" } }, "buildx": { @@ -339,6 +339,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "28.2.0-rc.1" + "version": "28.2.0-rc.2" } } From 1aa2d6b7d29531b6ab43d1bd6912745d2d522674 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 28 May 2025 16:04:17 -0700 Subject: [PATCH 489/667] Update 28 to 28.2.1 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-1809/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index bbcc6e9f8..bc0ad5d16 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.1.1 +ENV DOCKER_VERSION 28.2.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.2.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.2.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index 2f42d449a..b5c3fe05f 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/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-28.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.2.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.2.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 58a1f6e66..c0a21fadc 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.2.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.2.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index 33b16fe4b..bc22a210e 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/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 28.1.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.1.zip +ENV DOCKER_VERSION 28.2.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.1.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/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 4c58243d5..b1199cff3 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.1.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.1.zip +ENV DOCKER_VERSION 28.2.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.1.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index d751d03d2..9e781be1d 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.1.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.1.zip +ENV DOCKER_VERSION 28.2.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.1.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/versions.json b/versions.json index 117cf8a23..df8fa5c08 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.1.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.2.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.2.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.2.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.2.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.1.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.2.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.2.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.1.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.2.1.zip" } }, "buildx": { @@ -168,7 +168,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "28.1.1" + "version": "28.2.1" }, "28-rc": { "arches": { From b76938f9a2fa84bae742f7149eb0a9c19df56b32 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 28 May 2025 16:06:15 -0700 Subject: [PATCH 490/667] Update 28-rc --- 28-rc/cli/Dockerfile | 167 ------------ 28-rc/cli/docker-entrypoint.sh | 61 ----- 28-rc/cli/modprobe.sh | 20 -- 28-rc/dind-rootless/Dockerfile | 54 ---- 28-rc/dind/Dockerfile | 108 -------- 28-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windows/windowsservercore-1809/Dockerfile | 91 ------- .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 172 +------------ 10 files changed, 1 insertion(+), 1092 deletions(-) delete mode 100644 28-rc/cli/Dockerfile delete mode 100755 28-rc/cli/docker-entrypoint.sh delete mode 100755 28-rc/cli/modprobe.sh delete mode 100644 28-rc/dind-rootless/Dockerfile delete mode 100644 28-rc/dind/Dockerfile delete mode 100755 28-rc/dind/dockerd-entrypoint.sh delete mode 100644 28-rc/windows/windowsservercore-1809/Dockerfile delete mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile deleted file mode 100644 index e13db5b42..000000000 --- a/28-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.21 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 28.2.0-rc.2 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.24.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64'; \ - sha256='c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6'; \ - sha256='591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7'; \ - sha256='69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64'; \ - sha256='ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le'; \ - sha256='90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64'; \ - sha256='3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x'; \ - sha256='821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.36.2 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-x86_64'; \ - sha256='9040bd35b2cc0783ce6c5de491de7e52e24d4137dbfc5de8a524f718fc23556c'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv6'; \ - sha256='8260c11228337291dd2adcc1ee957756581047c5f40ad5ff6917660e8ebe7e61'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv7'; \ - sha256='9e9d20ebc4a094ee7788fbb5bddf70b0b319a55eee134db195d1e47f078ae0dc'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-aarch64'; \ - sha256='d1148609319706a57b755ff0f61d604a63a8cf57adb24c17535baa766ff14b4f'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-ppc64le'; \ - sha256='14b5db45d45808ece42066e4c978a6dddeb0c7ceffd656abfcb8182515fb9c7c'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-riscv64'; \ - sha256='17b86e88985f7ac6f282ea36e585d15a586584bc4f853466f92a9aed031772ed'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-s390x'; \ - sha256='65fe31a89326fb6de9f0e0c93c9abb0e88e407febc16b3551b92507e1ffbc965'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/28-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/28-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile deleted file mode 100644 index 250f7a9a4..000000000 --- a/28-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.2.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.2.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile deleted file mode 100644 index 4ce2c3668..000000000 --- a/28-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 8a291dfa5..000000000 --- a/28-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/28-rc/windows/windowsservercore-1809/Dockerfile b/28-rc/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 47a37be13..000000000 --- a/28-rc/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.2.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.24.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index ff8ff1ea9..000000000 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.2.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.24.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index b25f55f83..000000000 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.2.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.24.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index df8fa5c08..a44f06d5e 100644 --- a/versions.json +++ b/versions.json @@ -170,175 +170,5 @@ ], "version": "28.2.1" }, - "28-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.2.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.2.0-rc.2.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.2.0-rc.2.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.2.0-rc.2.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.2.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.2.0-rc.2.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.2.0-rc.2.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.24.0.linux-amd64", - "sha256": "c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.24.0.linux-arm-v6", - "sha256": "591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.24.0.linux-arm-v7", - "sha256": "69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.24.0.linux-arm64", - "sha256": "ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.24.0.freebsd-amd64", - "sha256": "889224cf7885ab6b1890c5019fe798021827ac73cfa6c8f1931418e09a4d8a18", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.24.0.freebsd-arm64", - "sha256": "2850060b31468f928cd34a25aa65725944f8969e4d09715499333f063a2f9bca", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.24.0.netbsd-amd64", - "sha256": "2e83d94835a1a19ff90c5a83e4039b445f8e3e1fc13d447a643d87cbbf2645aa", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.24.0.netbsd-arm64", - "sha256": "53964d5bfa7b4ed5977f0980f41a365f05808e98c674ce245692409c03897381", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.24.0.openbsd-amd64", - "sha256": "995c03911b43075a84c6310a0cf40d35f3752787e3bec8bb763f048d2036385c", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.24.0.openbsd-arm64", - "sha256": "9647a7d528058673ba26acf7d146e253fe2f6029c9a21e73b660659d6e4918b8", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.24.0.linux-ppc64le", - "sha256": "90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.24.0.linux-riscv64", - "sha256": "3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.24.0.linux-s390x", - "sha256": "821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.24.0.windows-amd64.exe", - "sha256": "8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.24.0.windows-arm64.exe", - "sha256": "fc0cd1fa1594ad6e0fc907a6f00b618ede1a3958ccc4ddf324dea3500946e046", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-arm64.exe" - } - }, - "version": "0.24.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "9040bd35b2cc0783ce6c5de491de7e52e24d4137dbfc5de8a524f718fc23556c", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "8260c11228337291dd2adcc1ee957756581047c5f40ad5ff6917660e8ebe7e61", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "9e9d20ebc4a094ee7788fbb5bddf70b0b319a55eee134db195d1e47f078ae0dc", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "d1148609319706a57b755ff0f61d604a63a8cf57adb24c17535baa766ff14b4f", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "e4479c44049f02e85b45cda129fd4edb1f389ebee894a1dc15a153898b87a160", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "065c65ec0dd579a82854fff9a8841f5be139362371d3cd5cf26cfdc953dbbbf3", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "14b5db45d45808ece42066e4c978a6dddeb0c7ceffd656abfcb8182515fb9c7c", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "17b86e88985f7ac6f282ea36e585d15a586584bc4f853466f92a9aed031772ed", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "65fe31a89326fb6de9f0e0c93c9abb0e88e407febc16b3551b92507e1ffbc965", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "c838e1f14dcb50b11498cc7e00b2faeb7816f422776d2800a62e47e039f56dad", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.36.2" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" - ], - "version": "28.2.0-rc.2" - } + "28-rc": null } From ac216a48589a02162b04badf29b22a09ca5c9043 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 30 May 2025 10:04:15 -0700 Subject: [PATCH 491/667] Update 28 to 28.2.2 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-1809/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index bc0ad5d16..389485bfb 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.2.1 +ENV DOCKER_VERSION 28.2.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.2.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.2.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index b5c3fe05f..d1e1038b0 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/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-28.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.2.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.2.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index c0a21fadc..0377f9c7d 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.2.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.2.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile index bc22a210e..0da716438 100644 --- a/28/windows/windowsservercore-1809/Dockerfile +++ b/28/windows/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 28.2.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.1.zip +ENV DOCKER_VERSION 28.2.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.2.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/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index b1199cff3..5fa983b33 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.2.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.1.zip +ENV DOCKER_VERSION 28.2.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.2.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 9e781be1d..98b0a8d84 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.2.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.1.zip +ENV DOCKER_VERSION 28.2.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.2.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/versions.json b/versions.json index a44f06d5e..0908e5711 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.2.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.2.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.2.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.2.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.2.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.2.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.2.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.2.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.2.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.2.2.zip" } }, "buildx": { @@ -168,7 +168,7 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "28.2.1" + "version": "28.2.2" }, "28-rc": null } From ba5f7338a42c48a61a7883140bab2e4ca2e80ea5 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 30 May 2025 10:42:01 -0700 Subject: [PATCH 492/667] Remove Windows Server 2019 / 1809 --- 28/windows/windowsservercore-1809/Dockerfile | 91 -------------------- versions.json | 3 +- versions.sh | 1 - 3 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 28/windows/windowsservercore-1809/Dockerfile diff --git a/28/windows/windowsservercore-1809/Dockerfile b/28/windows/windowsservercore-1809/Dockerfile deleted file mode 100644 index 0da716438..000000000 --- a/28/windows/windowsservercore-1809/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:1809 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.2.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.24.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 0908e5711..eaebec788 100644 --- a/versions.json +++ b/versions.json @@ -165,8 +165,7 @@ "dind", "dind-rootless", "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022", - "windows/windowsservercore-1809" + "windows/windowsservercore-ltsc2022" ], "version": "28.2.2" }, diff --git a/versions.sh b/versions.sh index eb38d8c65..6a41c01f8 100755 --- a/versions.sh +++ b/versions.sh @@ -284,7 +284,6 @@ for version in "${versions[@]}"; do dind-rootless \ windows/windowsservercore-ltsc2025 \ windows/windowsservercore-ltsc2022 \ - windows/windowsservercore-1809 \ ; do base="${variant%%/*}" # "buster", "windows", etc. if [ "$base" = 'windows' ] && [ -z "${hasArches['windows-amd64']}" ]; then From 5705e867cc73585b7e81cfd8acb2992ff4565868 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 5 Jun 2025 10:04:16 -0700 Subject: [PATCH 493/667] Update 28 to compose 2.37.0 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 389485bfb..d64cc3fd3 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.36.2 +ENV DOCKER_COMPOSE_VERSION 2.37.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-x86_64'; \ - sha256='9040bd35b2cc0783ce6c5de491de7e52e24d4137dbfc5de8a524f718fc23556c'; \ + url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-x86_64'; \ + sha256='e6e471b1e7bf0443592d3987dea6073f08db3e48ba0580199109aa7a44257e54'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv6'; \ - sha256='8260c11228337291dd2adcc1ee957756581047c5f40ad5ff6917660e8ebe7e61'; \ + url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-armv6'; \ + sha256='f09294bd81119701f051733b45be487d55faa29d20fb9c54412975a6c7fd8696'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv7'; \ - sha256='9e9d20ebc4a094ee7788fbb5bddf70b0b319a55eee134db195d1e47f078ae0dc'; \ + url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-armv7'; \ + sha256='b1b592889f15f50ddc77685ed499c69599117e52240b196447cb82821da3f7f8'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-aarch64'; \ - sha256='d1148609319706a57b755ff0f61d604a63a8cf57adb24c17535baa766ff14b4f'; \ + url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-aarch64'; \ + sha256='664e8c532ac0dd54d14af4eb3fe4edce86ce27d970ec832a96b55bc2ef1dffdf'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-ppc64le'; \ - sha256='14b5db45d45808ece42066e4c978a6dddeb0c7ceffd656abfcb8182515fb9c7c'; \ + url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-ppc64le'; \ + sha256='83c7cf5afffcc7944e23ba5c1c038aff4f2d760f08681d76b5271b66c9e2af5d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-riscv64'; \ - sha256='17b86e88985f7ac6f282ea36e585d15a586584bc4f853466f92a9aed031772ed'; \ + url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-riscv64'; \ + sha256='0e6047d2b0f745f0bbb13d707cfb945295bf45e397e67ff756f8551043a1f5bc'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-s390x'; \ - sha256='65fe31a89326fb6de9f0e0c93c9abb0e88e407febc16b3551b92507e1ffbc965'; \ + url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-s390x'; \ + sha256='381b5b77e6a91075e746167ac160062a1adf4d2a1121e433f1ca731ad08e2353'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 5fa983b33..3b859d6c5 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 +ENV DOCKER_COMPOSE_VERSION 2.37.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5ddd1ff588eb7251381cf6257b9be44fbb92c02d984ccfc94b4280e8c33d0f8f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 98b0a8d84..d05b2c646 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.36.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905 +ENV DOCKER_COMPOSE_VERSION 2.37.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5ddd1ff588eb7251381cf6257b9be44fbb92c02d984ccfc94b4280e8c33d0f8f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index eaebec788..649f15ace 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "9040bd35b2cc0783ce6c5de491de7e52e24d4137dbfc5de8a524f718fc23556c", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-x86_64" + "sha256": "e6e471b1e7bf0443592d3987dea6073f08db3e48ba0580199109aa7a44257e54", + "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "8260c11228337291dd2adcc1ee957756581047c5f40ad5ff6917660e8ebe7e61", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv6" + "sha256": "f09294bd81119701f051733b45be487d55faa29d20fb9c54412975a6c7fd8696", + "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9e9d20ebc4a094ee7788fbb5bddf70b0b319a55eee134db195d1e47f078ae0dc", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-armv7" + "sha256": "b1b592889f15f50ddc77685ed499c69599117e52240b196447cb82821da3f7f8", + "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d1148609319706a57b755ff0f61d604a63a8cf57adb24c17535baa766ff14b4f", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-aarch64" + "sha256": "664e8c532ac0dd54d14af4eb3fe4edce86ce27d970ec832a96b55bc2ef1dffdf", + "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "e4479c44049f02e85b45cda129fd4edb1f389ebee894a1dc15a153898b87a160", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-darwin-x86_64" + "sha256": "fde5ec3f7034fcd29ec9061d4bd71d41a7b4fa042ceab5b913576db6260899fa", + "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "065c65ec0dd579a82854fff9a8841f5be139362371d3cd5cf26cfdc953dbbbf3", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-darwin-aarch64" + "sha256": "575b0389c77c1ff914aa21f56f4ef68dc5c2322baf819b6ff69dfcae82f8271f", + "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "14b5db45d45808ece42066e4c978a6dddeb0c7ceffd656abfcb8182515fb9c7c", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-ppc64le" + "sha256": "83c7cf5afffcc7944e23ba5c1c038aff4f2d760f08681d76b5271b66c9e2af5d", + "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "17b86e88985f7ac6f282ea36e585d15a586584bc4f853466f92a9aed031772ed", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-riscv64" + "sha256": "0e6047d2b0f745f0bbb13d707cfb945295bf45e397e67ff756f8551043a1f5bc", + "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "65fe31a89326fb6de9f0e0c93c9abb0e88e407febc16b3551b92507e1ffbc965", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-linux-s390x" + "sha256": "381b5b77e6a91075e746167ac160062a1adf4d2a1121e433f1ca731ad08e2353", + "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "82ebec0022949087f883b3dffa0d7e57a2a141203ad31c012381d2754962c905", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-x86_64.exe" + "sha256": "5ddd1ff588eb7251381cf6257b9be44fbb92c02d984ccfc94b4280e8c33d0f8f", + "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "c838e1f14dcb50b11498cc7e00b2faeb7816f422776d2800a62e47e039f56dad", - "url": "https://github.com/docker/compose/releases/download/v2.36.2/docker-compose-windows-aarch64.exe" + "sha256": "7dbddc0e6fe86b504bba6c342f49725703048bcf1a9dd8a42b457de24bfe51e8", + "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.36.2" + "version": "2.37.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From e9f3fbf07fb73d5266464f898f71510f25fa3266 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 5 Jun 2025 10:36:11 -0700 Subject: [PATCH 494/667] Update to Alpine 3.22 --- 28/cli/Dockerfile | 2 +- 28/dind/Dockerfile | 2 +- Dockerfile-cli.template | 2 +- Dockerfile-dind.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index d64cc3fd3..eec1ac1f6 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.22 RUN apk add --no-cache \ ca-certificates \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 0377f9c7d..3fda7474a 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -40,7 +40,7 @@ RUN set -eux; \ ip6tables-restore \ ; do \ # "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 +# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 b="$(command -v "${f/tables/tables-legacy}")"; \ "$b" --version; \ ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index c47397831..7d64c0b50 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -1,5 +1,5 @@ {{ include "shared" -}} -FROM alpine:3.21 +FROM alpine:3.22 RUN apk add --no-cache \ ca-certificates \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index e9dafb72c..69b276594 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -35,7 +35,7 @@ RUN set -eux; \ ip6tables-restore \ ; do \ # "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.21&name=iptables-legacy&arch=x86_64 +# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 b="$(command -v "${f/tables/tables-legacy}")"; \ "$b" --version; \ ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ From 46b52b3a685ae16281bb08c1df1622f0a5b3ae24 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 12 Jun 2025 04:04:16 -0700 Subject: [PATCH 495/667] Update 28 to compose 2.37.1 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index eec1ac1f6..4160d1aba 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.37.0 +ENV DOCKER_COMPOSE_VERSION 2.37.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-x86_64'; \ - sha256='e6e471b1e7bf0443592d3987dea6073f08db3e48ba0580199109aa7a44257e54'; \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-x86_64'; \ + sha256='6777247eb2947c48b46b1fc96602ac17e140fbac84e1043e6384a6c755fc6769'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-armv6'; \ - sha256='f09294bd81119701f051733b45be487d55faa29d20fb9c54412975a6c7fd8696'; \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv6'; \ + sha256='1a7731a63ec845b4b4cf2510e68a8f3411386b1e4b5b03916a0d21a697596f03'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-armv7'; \ - sha256='b1b592889f15f50ddc77685ed499c69599117e52240b196447cb82821da3f7f8'; \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv7'; \ + sha256='63e64d9aad9916771a947e4b77df6b2a5e70cdfdb412b2f0464806f4d63fabe8'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-aarch64'; \ - sha256='664e8c532ac0dd54d14af4eb3fe4edce86ce27d970ec832a96b55bc2ef1dffdf'; \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-aarch64'; \ + sha256='36dfcc81ffff0ec2a76abaa4b66edf01d2db0d7f3fda342a26525eb72e4e9a80'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-ppc64le'; \ - sha256='83c7cf5afffcc7944e23ba5c1c038aff4f2d760f08681d76b5271b66c9e2af5d'; \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-ppc64le'; \ + sha256='4410f045bfc084fef1f0fcea2c3f8e665cad6c5055f57f1089dd009bb9b65151'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-riscv64'; \ - sha256='0e6047d2b0f745f0bbb13d707cfb945295bf45e397e67ff756f8551043a1f5bc'; \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-riscv64'; \ + sha256='6d551f86c2ab9155882f5a1067223d0c0c80b47669c826af4311c305cc637093'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-s390x'; \ - sha256='381b5b77e6a91075e746167ac160062a1adf4d2a1121e433f1ca731ad08e2353'; \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-s390x'; \ + sha256='6012d0bd529312d12937fd153583a90ddb29aec7a7a8cfaac8e7fb7d1ceabf6f'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 3b859d6c5..ba587f142 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5ddd1ff588eb7251381cf6257b9be44fbb92c02d984ccfc94b4280e8c33d0f8f +ENV DOCKER_COMPOSE_VERSION 2.37.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index d05b2c646..e46c0c38b 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5ddd1ff588eb7251381cf6257b9be44fbb92c02d984ccfc94b4280e8c33d0f8f +ENV DOCKER_COMPOSE_VERSION 2.37.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 649f15ace..78f82cee4 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e6e471b1e7bf0443592d3987dea6073f08db3e48ba0580199109aa7a44257e54", - "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-x86_64" + "sha256": "6777247eb2947c48b46b1fc96602ac17e140fbac84e1043e6384a6c755fc6769", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "f09294bd81119701f051733b45be487d55faa29d20fb9c54412975a6c7fd8696", - "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-armv6" + "sha256": "1a7731a63ec845b4b4cf2510e68a8f3411386b1e4b5b03916a0d21a697596f03", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "b1b592889f15f50ddc77685ed499c69599117e52240b196447cb82821da3f7f8", - "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-armv7" + "sha256": "63e64d9aad9916771a947e4b77df6b2a5e70cdfdb412b2f0464806f4d63fabe8", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "664e8c532ac0dd54d14af4eb3fe4edce86ce27d970ec832a96b55bc2ef1dffdf", - "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-aarch64" + "sha256": "36dfcc81ffff0ec2a76abaa4b66edf01d2db0d7f3fda342a26525eb72e4e9a80", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "fde5ec3f7034fcd29ec9061d4bd71d41a7b4fa042ceab5b913576db6260899fa", - "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-darwin-x86_64" + "sha256": "4ade1940dba68882098778b2f46d6945f4b4f41c0e7be8cc7d3184bc6d9f25e5", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "575b0389c77c1ff914aa21f56f4ef68dc5c2322baf819b6ff69dfcae82f8271f", - "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-darwin-aarch64" + "sha256": "5e50b5c610c2374025eeff96de516e296126c727782d250c405ba1e9dbecb3c4", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "83c7cf5afffcc7944e23ba5c1c038aff4f2d760f08681d76b5271b66c9e2af5d", - "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-ppc64le" + "sha256": "4410f045bfc084fef1f0fcea2c3f8e665cad6c5055f57f1089dd009bb9b65151", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "0e6047d2b0f745f0bbb13d707cfb945295bf45e397e67ff756f8551043a1f5bc", - "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-riscv64" + "sha256": "6d551f86c2ab9155882f5a1067223d0c0c80b47669c826af4311c305cc637093", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "381b5b77e6a91075e746167ac160062a1adf4d2a1121e433f1ca731ad08e2353", - "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-linux-s390x" + "sha256": "6012d0bd529312d12937fd153583a90ddb29aec7a7a8cfaac8e7fb7d1ceabf6f", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "5ddd1ff588eb7251381cf6257b9be44fbb92c02d984ccfc94b4280e8c33d0f8f", - "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-windows-x86_64.exe" + "sha256": "132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "7dbddc0e6fe86b504bba6c342f49725703048bcf1a9dd8a42b457de24bfe51e8", - "url": "https://github.com/docker/compose/releases/download/v2.37.0/docker-compose-windows-aarch64.exe" + "sha256": "6f0a78a707bf631d3c64bfd21c838dbd82443fae99cf0b285aa140aff62945f9", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.37.0" + "version": "2.37.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 76619ecee54053ecbbb38f1d4a8c5d40d3688b1c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 16 Jun 2025 10:04:22 -0700 Subject: [PATCH 496/667] Update 28-rc to 28.3.0-rc.1, buildx 0.24.0, compose 2.37.1 --- 28-rc/cli/Dockerfile | 167 ++++++++++++ 28-rc/cli/docker-entrypoint.sh | 61 +++++ 28-rc/cli/modprobe.sh | 20 ++ 28-rc/dind-rootless/Dockerfile | 54 ++++ 28-rc/dind/Dockerfile | 108 ++++++++ 28-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 171 ++++++++++++- 9 files changed, 1000 insertions(+), 1 deletion(-) create mode 100644 28-rc/cli/Dockerfile create mode 100755 28-rc/cli/docker-entrypoint.sh create mode 100755 28-rc/cli/modprobe.sh create mode 100644 28-rc/dind-rootless/Dockerfile create mode 100644 28-rc/dind/Dockerfile create mode 100755 28-rc/dind/dockerd-entrypoint.sh create mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile new file mode 100644 index 000000000..f8ba30f97 --- /dev/null +++ b/28-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.22 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 28.3.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.24.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64'; \ + sha256='c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6'; \ + sha256='591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7'; \ + sha256='69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64'; \ + sha256='ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le'; \ + sha256='90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64'; \ + sha256='3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x'; \ + sha256='821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.37.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-x86_64'; \ + sha256='6777247eb2947c48b46b1fc96602ac17e140fbac84e1043e6384a6c755fc6769'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv6'; \ + sha256='1a7731a63ec845b4b4cf2510e68a8f3411386b1e4b5b03916a0d21a697596f03'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv7'; \ + sha256='63e64d9aad9916771a947e4b77df6b2a5e70cdfdb412b2f0464806f4d63fabe8'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-aarch64'; \ + sha256='36dfcc81ffff0ec2a76abaa4b66edf01d2db0d7f3fda342a26525eb72e4e9a80'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-ppc64le'; \ + sha256='4410f045bfc084fef1f0fcea2c3f8e665cad6c5055f57f1089dd009bb9b65151'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-riscv64'; \ + sha256='6d551f86c2ab9155882f5a1067223d0c0c80b47669c826af4311c305cc637093'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-s390x'; \ + sha256='6012d0bd529312d12937fd153583a90ddb29aec7a7a8cfaac8e7fb7d1ceabf6f'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/28-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/28-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..2504a0c58 --- /dev/null +++ b/28-rc/dind-rootless/Dockerfile @@ -0,0 +1,54 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-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 +RUN apk add --no-cache iproute2 fuse-overlayfs + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.3.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.3.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile new file mode 100644 index 000000000..d2dab14af --- /dev/null +++ b/28-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..8a291dfa5 --- /dev/null +++ b/28-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..100182f76 --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.3.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.24.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.37.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..cf25dd1b6 --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.3.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.24.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.37.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 78f82cee4..686796742 100644 --- a/versions.json +++ b/versions.json @@ -169,5 +169,174 @@ ], "version": "28.2.2" }, - "28-rc": null + "28-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.3.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.3.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.24.0.linux-amd64", + "sha256": "c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.24.0.linux-arm-v6", + "sha256": "591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.24.0.linux-arm-v7", + "sha256": "69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.24.0.linux-arm64", + "sha256": "ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.24.0.freebsd-amd64", + "sha256": "889224cf7885ab6b1890c5019fe798021827ac73cfa6c8f1931418e09a4d8a18", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.24.0.freebsd-arm64", + "sha256": "2850060b31468f928cd34a25aa65725944f8969e4d09715499333f063a2f9bca", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.24.0.netbsd-amd64", + "sha256": "2e83d94835a1a19ff90c5a83e4039b445f8e3e1fc13d447a643d87cbbf2645aa", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.24.0.netbsd-arm64", + "sha256": "53964d5bfa7b4ed5977f0980f41a365f05808e98c674ce245692409c03897381", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.24.0.openbsd-amd64", + "sha256": "995c03911b43075a84c6310a0cf40d35f3752787e3bec8bb763f048d2036385c", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.24.0.openbsd-arm64", + "sha256": "9647a7d528058673ba26acf7d146e253fe2f6029c9a21e73b660659d6e4918b8", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.24.0.linux-ppc64le", + "sha256": "90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.24.0.linux-riscv64", + "sha256": "3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.24.0.linux-s390x", + "sha256": "821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.24.0.windows-amd64.exe", + "sha256": "8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.24.0.windows-arm64.exe", + "sha256": "fc0cd1fa1594ad6e0fc907a6f00b618ede1a3958ccc4ddf324dea3500946e046", + "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-arm64.exe" + } + }, + "version": "0.24.0" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "6777247eb2947c48b46b1fc96602ac17e140fbac84e1043e6384a6c755fc6769", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "1a7731a63ec845b4b4cf2510e68a8f3411386b1e4b5b03916a0d21a697596f03", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "63e64d9aad9916771a947e4b77df6b2a5e70cdfdb412b2f0464806f4d63fabe8", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "36dfcc81ffff0ec2a76abaa4b66edf01d2db0d7f3fda342a26525eb72e4e9a80", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "4ade1940dba68882098778b2f46d6945f4b4f41c0e7be8cc7d3184bc6d9f25e5", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "5e50b5c610c2374025eeff96de516e296126c727782d250c405ba1e9dbecb3c4", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "4410f045bfc084fef1f0fcea2c3f8e665cad6c5055f57f1089dd009bb9b65151", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "6d551f86c2ab9155882f5a1067223d0c0c80b47669c826af4311c305cc637093", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "6012d0bd529312d12937fd153583a90ddb29aec7a7a8cfaac8e7fb7d1ceabf6f", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "6f0a78a707bf631d3c64bfd21c838dbd82443fae99cf0b285aa140aff62945f9", + "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.37.1" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "28.3.0-rc.1" + } } From 689bb251b0f0110dd24f306d9eacafd27826a412 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Jun 2025 16:04:16 -0700 Subject: [PATCH 497/667] Update 28 to buildx 0.25.0 --- 28/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 4160d1aba..336b44588 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.24.0 +ENV DOCKER_BUILDX_VERSION 0.25.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64'; \ - sha256='c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-amd64'; \ + sha256='4104d79a791a8744c0b43fd5bd0a6172dff29040c5229946a1cdb2d27b0b5bfa'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6'; \ - sha256='591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v6'; \ + sha256='4b92125aa797875108174d9d8ae2e92bdf1db82c97dcf8b3bb72490a62fd8122'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7'; \ - sha256='69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v7'; \ + sha256='0c943fa7001cde147ab7663e36c92259ddde2a3ce0b6f5dfcbc3535dc67f8661'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64'; \ - sha256='ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm64'; \ + sha256='f07063844bb750172c1f25cef61b07a8314d24bedffc015517b3ec4016b16de8'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le'; \ - sha256='90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-ppc64le'; \ + sha256='9ac89d1401b105be41e98760aaaae00e4f44e180e757bf6044d2824ff14788bf'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64'; \ - sha256='3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-riscv64'; \ + sha256='17829ab06c8ec984201170bfb676e6cd311312983814354505fb679b36c02177'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x'; \ - sha256='821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-s390x'; \ + sha256='1b4a7d86fee5b6a48fd153418bd6ed8f0c82bc5d7eb3b219052e834ece977440'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index ba587f142..45d6dc98a 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.24.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 +ENV DOCKER_BUILDX_VERSION 0.25.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index e46c0c38b..764970a6e 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.24.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 +ENV DOCKER_BUILDX_VERSION 0.25.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 686796742..6dca7d974 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.24.0.linux-amd64", - "sha256": "c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64" + "file": "buildx-v0.25.0.linux-amd64", + "sha256": "4104d79a791a8744c0b43fd5bd0a6172dff29040c5229946a1cdb2d27b0b5bfa", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.24.0.linux-arm-v6", - "sha256": "591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6" + "file": "buildx-v0.25.0.linux-arm-v6", + "sha256": "4b92125aa797875108174d9d8ae2e92bdf1db82c97dcf8b3bb72490a62fd8122", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.24.0.linux-arm-v7", - "sha256": "69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7" + "file": "buildx-v0.25.0.linux-arm-v7", + "sha256": "0c943fa7001cde147ab7663e36c92259ddde2a3ce0b6f5dfcbc3535dc67f8661", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.24.0.linux-arm64", - "sha256": "ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64" + "file": "buildx-v0.25.0.linux-arm64", + "sha256": "f07063844bb750172c1f25cef61b07a8314d24bedffc015517b3ec4016b16de8", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.24.0.freebsd-amd64", - "sha256": "889224cf7885ab6b1890c5019fe798021827ac73cfa6c8f1931418e09a4d8a18", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-amd64" + "file": "buildx-v0.25.0.freebsd-amd64", + "sha256": "45dd1326b045142eee57f9483b62ab3f98baf00db7aa05778703957ddd8639d2", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.24.0.freebsd-arm64", - "sha256": "2850060b31468f928cd34a25aa65725944f8969e4d09715499333f063a2f9bca", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-arm64" + "file": "buildx-v0.25.0.freebsd-arm64", + "sha256": "8d3cb390b75f143c499fe7204efdfc79a69cff1a83ba024212855a1856af38fb", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.24.0.netbsd-amd64", - "sha256": "2e83d94835a1a19ff90c5a83e4039b445f8e3e1fc13d447a643d87cbbf2645aa", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-amd64" + "file": "buildx-v0.25.0.netbsd-amd64", + "sha256": "868d5ba797882c35b9063c2771cb548c18ecbe5022cfdcf97c273a136f2e48d2", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.24.0.netbsd-arm64", - "sha256": "53964d5bfa7b4ed5977f0980f41a365f05808e98c674ce245692409c03897381", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-arm64" + "file": "buildx-v0.25.0.netbsd-arm64", + "sha256": "9631901fe021143ff1d9bb27dda61567fe179762de7ccd3800e672d8ee77363a", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.24.0.openbsd-amd64", - "sha256": "995c03911b43075a84c6310a0cf40d35f3752787e3bec8bb763f048d2036385c", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-amd64" + "file": "buildx-v0.25.0.openbsd-amd64", + "sha256": "81aa95929a7f7826c5c48b5d35883214b944c86127960d653855270ba04ff7ed", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.24.0.openbsd-arm64", - "sha256": "9647a7d528058673ba26acf7d146e253fe2f6029c9a21e73b660659d6e4918b8", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-arm64" + "file": "buildx-v0.25.0.openbsd-arm64", + "sha256": "2d0d9b656194bdfa8b5480c8bae89a04a1a437bb99f6a3c512e52aa021710450", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.24.0.linux-ppc64le", - "sha256": "90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le" + "file": "buildx-v0.25.0.linux-ppc64le", + "sha256": "9ac89d1401b105be41e98760aaaae00e4f44e180e757bf6044d2824ff14788bf", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.24.0.linux-riscv64", - "sha256": "3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64" + "file": "buildx-v0.25.0.linux-riscv64", + "sha256": "17829ab06c8ec984201170bfb676e6cd311312983814354505fb679b36c02177", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.24.0.linux-s390x", - "sha256": "821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x" + "file": "buildx-v0.25.0.linux-s390x", + "sha256": "1b4a7d86fee5b6a48fd153418bd6ed8f0c82bc5d7eb3b219052e834ece977440", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.24.0.windows-amd64.exe", - "sha256": "8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe" + "file": "buildx-v0.25.0.windows-amd64.exe", + "sha256": "22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.24.0.windows-arm64.exe", - "sha256": "fc0cd1fa1594ad6e0fc907a6f00b618ede1a3958ccc4ddf324dea3500946e046", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-arm64.exe" + "file": "buildx-v0.25.0.windows-arm64.exe", + "sha256": "a18f8da7394b9602a4496f64d43bc9dc64884c09760a2218a2e2f90cddb8261d", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-arm64.exe" } }, - "version": "0.24.0" + "version": "0.25.0" }, "compose": { "arches": { From c90609cf2ae49f9d87aec68d9ce5eb39c0cb868d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Jun 2025 16:06:08 -0700 Subject: [PATCH 498/667] Update 28-rc to buildx 0.25.0 --- 28-rc/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index f8ba30f97..ddf3b9a0d 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.24.0 +ENV DOCKER_BUILDX_VERSION 0.25.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64'; \ - sha256='c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-amd64'; \ + sha256='4104d79a791a8744c0b43fd5bd0a6172dff29040c5229946a1cdb2d27b0b5bfa'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6'; \ - sha256='591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v6'; \ + sha256='4b92125aa797875108174d9d8ae2e92bdf1db82c97dcf8b3bb72490a62fd8122'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7'; \ - sha256='69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v7'; \ + sha256='0c943fa7001cde147ab7663e36c92259ddde2a3ce0b6f5dfcbc3535dc67f8661'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64'; \ - sha256='ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm64'; \ + sha256='f07063844bb750172c1f25cef61b07a8314d24bedffc015517b3ec4016b16de8'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le'; \ - sha256='90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-ppc64le'; \ + sha256='9ac89d1401b105be41e98760aaaae00e4f44e180e757bf6044d2824ff14788bf'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64'; \ - sha256='3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-riscv64'; \ + sha256='17829ab06c8ec984201170bfb676e6cd311312983814354505fb679b36c02177'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x'; \ - sha256='821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2'; \ + url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-s390x'; \ + sha256='1b4a7d86fee5b6a48fd153418bd6ed8f0c82bc5d7eb3b219052e834ece977440'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 100182f76..272c412d8 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.24.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 +ENV DOCKER_BUILDX_VERSION 0.25.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index cf25dd1b6..99c2d78fa 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.24.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140 +ENV DOCKER_BUILDX_VERSION 0.25.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6dca7d974..a4da57907 100644 --- a/versions.json +++ b/versions.json @@ -192,82 +192,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.24.0.linux-amd64", - "sha256": "c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64" + "file": "buildx-v0.25.0.linux-amd64", + "sha256": "4104d79a791a8744c0b43fd5bd0a6172dff29040c5229946a1cdb2d27b0b5bfa", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.24.0.linux-arm-v6", - "sha256": "591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6" + "file": "buildx-v0.25.0.linux-arm-v6", + "sha256": "4b92125aa797875108174d9d8ae2e92bdf1db82c97dcf8b3bb72490a62fd8122", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.24.0.linux-arm-v7", - "sha256": "69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7" + "file": "buildx-v0.25.0.linux-arm-v7", + "sha256": "0c943fa7001cde147ab7663e36c92259ddde2a3ce0b6f5dfcbc3535dc67f8661", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.24.0.linux-arm64", - "sha256": "ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64" + "file": "buildx-v0.25.0.linux-arm64", + "sha256": "f07063844bb750172c1f25cef61b07a8314d24bedffc015517b3ec4016b16de8", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.24.0.freebsd-amd64", - "sha256": "889224cf7885ab6b1890c5019fe798021827ac73cfa6c8f1931418e09a4d8a18", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-amd64" + "file": "buildx-v0.25.0.freebsd-amd64", + "sha256": "45dd1326b045142eee57f9483b62ab3f98baf00db7aa05778703957ddd8639d2", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.24.0.freebsd-arm64", - "sha256": "2850060b31468f928cd34a25aa65725944f8969e4d09715499333f063a2f9bca", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.freebsd-arm64" + "file": "buildx-v0.25.0.freebsd-arm64", + "sha256": "8d3cb390b75f143c499fe7204efdfc79a69cff1a83ba024212855a1856af38fb", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.24.0.netbsd-amd64", - "sha256": "2e83d94835a1a19ff90c5a83e4039b445f8e3e1fc13d447a643d87cbbf2645aa", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-amd64" + "file": "buildx-v0.25.0.netbsd-amd64", + "sha256": "868d5ba797882c35b9063c2771cb548c18ecbe5022cfdcf97c273a136f2e48d2", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.24.0.netbsd-arm64", - "sha256": "53964d5bfa7b4ed5977f0980f41a365f05808e98c674ce245692409c03897381", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.netbsd-arm64" + "file": "buildx-v0.25.0.netbsd-arm64", + "sha256": "9631901fe021143ff1d9bb27dda61567fe179762de7ccd3800e672d8ee77363a", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.24.0.openbsd-amd64", - "sha256": "995c03911b43075a84c6310a0cf40d35f3752787e3bec8bb763f048d2036385c", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-amd64" + "file": "buildx-v0.25.0.openbsd-amd64", + "sha256": "81aa95929a7f7826c5c48b5d35883214b944c86127960d653855270ba04ff7ed", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.24.0.openbsd-arm64", - "sha256": "9647a7d528058673ba26acf7d146e253fe2f6029c9a21e73b660659d6e4918b8", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.openbsd-arm64" + "file": "buildx-v0.25.0.openbsd-arm64", + "sha256": "2d0d9b656194bdfa8b5480c8bae89a04a1a437bb99f6a3c512e52aa021710450", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.24.0.linux-ppc64le", - "sha256": "90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le" + "file": "buildx-v0.25.0.linux-ppc64le", + "sha256": "9ac89d1401b105be41e98760aaaae00e4f44e180e757bf6044d2824ff14788bf", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.24.0.linux-riscv64", - "sha256": "3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64" + "file": "buildx-v0.25.0.linux-riscv64", + "sha256": "17829ab06c8ec984201170bfb676e6cd311312983814354505fb679b36c02177", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.24.0.linux-s390x", - "sha256": "821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x" + "file": "buildx-v0.25.0.linux-s390x", + "sha256": "1b4a7d86fee5b6a48fd153418bd6ed8f0c82bc5d7eb3b219052e834ece977440", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.24.0.windows-amd64.exe", - "sha256": "8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe" + "file": "buildx-v0.25.0.windows-amd64.exe", + "sha256": "22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.24.0.windows-arm64.exe", - "sha256": "fc0cd1fa1594ad6e0fc907a6f00b618ede1a3958ccc4ddf324dea3500946e046", - "url": "https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-arm64.exe" + "file": "buildx-v0.25.0.windows-arm64.exe", + "sha256": "a18f8da7394b9602a4496f64d43bc9dc64884c09760a2218a2e2f90cddb8261d", + "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-arm64.exe" } }, - "version": "0.24.0" + "version": "0.25.0" }, "compose": { "arches": { From c59f9ebaabd0350f4247a89bf021281dda9e587f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 20 Jun 2025 10:04:17 -0700 Subject: [PATCH 499/667] Update 28 to compose 2.37.2 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 336b44588..59335aad8 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.37.1 +ENV DOCKER_COMPOSE_VERSION 2.37.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-x86_64'; \ - sha256='6777247eb2947c48b46b1fc96602ac17e140fbac84e1043e6384a6c755fc6769'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-x86_64'; \ + sha256='95db7bb2ed5d5fc790a12559b9092d641637c2d0190939c282b52a7af572a8a7'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv6'; \ - sha256='1a7731a63ec845b4b4cf2510e68a8f3411386b1e4b5b03916a0d21a697596f03'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv6'; \ + sha256='863412d376cb1341e2a6889aa58dc4b674a58350ceccc357c71284109a5cb4a2'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv7'; \ - sha256='63e64d9aad9916771a947e4b77df6b2a5e70cdfdb412b2f0464806f4d63fabe8'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv7'; \ + sha256='33aa26709150e835992a8af58d590e32151473f78daea549ccd70bd5f96c3bbf'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-aarch64'; \ - sha256='36dfcc81ffff0ec2a76abaa4b66edf01d2db0d7f3fda342a26525eb72e4e9a80'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-aarch64'; \ + sha256='d2c195cf553e55d06761c192133a6a7b4d67d275c7f5ce673bbf8ecf20814061'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-ppc64le'; \ - sha256='4410f045bfc084fef1f0fcea2c3f8e665cad6c5055f57f1089dd009bb9b65151'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-ppc64le'; \ + sha256='6c72243b9585cc741c8e90937fd28ca2c8f2fee8a7636b30d1bbf312df27e157'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-riscv64'; \ - sha256='6d551f86c2ab9155882f5a1067223d0c0c80b47669c826af4311c305cc637093'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-riscv64'; \ + sha256='8448828a5fa46170b92fec62d928b753ba91e86cccace24a04187324b65836ac'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-s390x'; \ - sha256='6012d0bd529312d12937fd153583a90ddb29aec7a7a8cfaac8e7fb7d1ceabf6f'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-s390x'; \ + sha256='39d47d8aa2cec059b4dc5e9b627a1176bcce33d9090f237806cf59264fe55e89'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 45d6dc98a..189b438d1 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801 +ENV DOCKER_COMPOSE_VERSION 2.37.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 764970a6e..a3ed29e31 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801 +ENV DOCKER_COMPOSE_VERSION 2.37.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index a4da57907..5ed543fc1 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6777247eb2947c48b46b1fc96602ac17e140fbac84e1043e6384a6c755fc6769", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-x86_64" + "sha256": "95db7bb2ed5d5fc790a12559b9092d641637c2d0190939c282b52a7af572a8a7", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "1a7731a63ec845b4b4cf2510e68a8f3411386b1e4b5b03916a0d21a697596f03", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv6" + "sha256": "863412d376cb1341e2a6889aa58dc4b674a58350ceccc357c71284109a5cb4a2", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "63e64d9aad9916771a947e4b77df6b2a5e70cdfdb412b2f0464806f4d63fabe8", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv7" + "sha256": "33aa26709150e835992a8af58d590e32151473f78daea549ccd70bd5f96c3bbf", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "36dfcc81ffff0ec2a76abaa4b66edf01d2db0d7f3fda342a26525eb72e4e9a80", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-aarch64" + "sha256": "d2c195cf553e55d06761c192133a6a7b4d67d275c7f5ce673bbf8ecf20814061", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "4ade1940dba68882098778b2f46d6945f4b4f41c0e7be8cc7d3184bc6d9f25e5", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-darwin-x86_64" + "sha256": "b4ab6151185f8558f931c5a26b9f3495be7eb0044b3915c2abe0409194cc13c3", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5e50b5c610c2374025eeff96de516e296126c727782d250c405ba1e9dbecb3c4", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-darwin-aarch64" + "sha256": "9ff6ee36bbb1995155995015ea93c2224632cd49da7897eae48908a664f25038", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4410f045bfc084fef1f0fcea2c3f8e665cad6c5055f57f1089dd009bb9b65151", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-ppc64le" + "sha256": "6c72243b9585cc741c8e90937fd28ca2c8f2fee8a7636b30d1bbf312df27e157", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "6d551f86c2ab9155882f5a1067223d0c0c80b47669c826af4311c305cc637093", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-riscv64" + "sha256": "8448828a5fa46170b92fec62d928b753ba91e86cccace24a04187324b65836ac", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6012d0bd529312d12937fd153583a90ddb29aec7a7a8cfaac8e7fb7d1ceabf6f", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-s390x" + "sha256": "39d47d8aa2cec059b4dc5e9b627a1176bcce33d9090f237806cf59264fe55e89", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe" + "sha256": "f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "6f0a78a707bf631d3c64bfd21c838dbd82443fae99cf0b285aa140aff62945f9", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-aarch64.exe" + "sha256": "1cb0ffdd4dfbf446f0300b96d64d1a18040aadee9e939bb2cdff8623e8613a4f", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.37.1" + "version": "2.37.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 5b7a395945d5b13e906b42b6d7f878dc9a461a25 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 20 Jun 2025 10:06:07 -0700 Subject: [PATCH 500/667] Update 28-rc to compose 2.37.2 --- 28-rc/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index ddf3b9a0d..d32d13f43 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.37.1 +ENV DOCKER_COMPOSE_VERSION 2.37.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-x86_64'; \ - sha256='6777247eb2947c48b46b1fc96602ac17e140fbac84e1043e6384a6c755fc6769'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-x86_64'; \ + sha256='95db7bb2ed5d5fc790a12559b9092d641637c2d0190939c282b52a7af572a8a7'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv6'; \ - sha256='1a7731a63ec845b4b4cf2510e68a8f3411386b1e4b5b03916a0d21a697596f03'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv6'; \ + sha256='863412d376cb1341e2a6889aa58dc4b674a58350ceccc357c71284109a5cb4a2'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv7'; \ - sha256='63e64d9aad9916771a947e4b77df6b2a5e70cdfdb412b2f0464806f4d63fabe8'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv7'; \ + sha256='33aa26709150e835992a8af58d590e32151473f78daea549ccd70bd5f96c3bbf'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-aarch64'; \ - sha256='36dfcc81ffff0ec2a76abaa4b66edf01d2db0d7f3fda342a26525eb72e4e9a80'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-aarch64'; \ + sha256='d2c195cf553e55d06761c192133a6a7b4d67d275c7f5ce673bbf8ecf20814061'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-ppc64le'; \ - sha256='4410f045bfc084fef1f0fcea2c3f8e665cad6c5055f57f1089dd009bb9b65151'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-ppc64le'; \ + sha256='6c72243b9585cc741c8e90937fd28ca2c8f2fee8a7636b30d1bbf312df27e157'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-riscv64'; \ - sha256='6d551f86c2ab9155882f5a1067223d0c0c80b47669c826af4311c305cc637093'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-riscv64'; \ + sha256='8448828a5fa46170b92fec62d928b753ba91e86cccace24a04187324b65836ac'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-s390x'; \ - sha256='6012d0bd529312d12937fd153583a90ddb29aec7a7a8cfaac8e7fb7d1ceabf6f'; \ + url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-s390x'; \ + sha256='39d47d8aa2cec059b4dc5e9b627a1176bcce33d9090f237806cf59264fe55e89'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 272c412d8..25eea6d23 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801 +ENV DOCKER_COMPOSE_VERSION 2.37.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index 99c2d78fa..8e371d065 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801 +ENV DOCKER_COMPOSE_VERSION 2.37.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 5ed543fc1..32293f483 100644 --- a/versions.json +++ b/versions.json @@ -273,61 +273,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6777247eb2947c48b46b1fc96602ac17e140fbac84e1043e6384a6c755fc6769", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-x86_64" + "sha256": "95db7bb2ed5d5fc790a12559b9092d641637c2d0190939c282b52a7af572a8a7", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "1a7731a63ec845b4b4cf2510e68a8f3411386b1e4b5b03916a0d21a697596f03", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv6" + "sha256": "863412d376cb1341e2a6889aa58dc4b674a58350ceccc357c71284109a5cb4a2", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "63e64d9aad9916771a947e4b77df6b2a5e70cdfdb412b2f0464806f4d63fabe8", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-armv7" + "sha256": "33aa26709150e835992a8af58d590e32151473f78daea549ccd70bd5f96c3bbf", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "36dfcc81ffff0ec2a76abaa4b66edf01d2db0d7f3fda342a26525eb72e4e9a80", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-aarch64" + "sha256": "d2c195cf553e55d06761c192133a6a7b4d67d275c7f5ce673bbf8ecf20814061", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "4ade1940dba68882098778b2f46d6945f4b4f41c0e7be8cc7d3184bc6d9f25e5", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-darwin-x86_64" + "sha256": "b4ab6151185f8558f931c5a26b9f3495be7eb0044b3915c2abe0409194cc13c3", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5e50b5c610c2374025eeff96de516e296126c727782d250c405ba1e9dbecb3c4", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-darwin-aarch64" + "sha256": "9ff6ee36bbb1995155995015ea93c2224632cd49da7897eae48908a664f25038", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4410f045bfc084fef1f0fcea2c3f8e665cad6c5055f57f1089dd009bb9b65151", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-ppc64le" + "sha256": "6c72243b9585cc741c8e90937fd28ca2c8f2fee8a7636b30d1bbf312df27e157", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "6d551f86c2ab9155882f5a1067223d0c0c80b47669c826af4311c305cc637093", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-riscv64" + "sha256": "8448828a5fa46170b92fec62d928b753ba91e86cccace24a04187324b65836ac", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6012d0bd529312d12937fd153583a90ddb29aec7a7a8cfaac8e7fb7d1ceabf6f", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-linux-s390x" + "sha256": "39d47d8aa2cec059b4dc5e9b627a1176bcce33d9090f237806cf59264fe55e89", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "132fb31ef7dc81a82d7b1429adf3fd76cc0a7128059af3a172945445a50f2801", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-x86_64.exe" + "sha256": "f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "6f0a78a707bf631d3c64bfd21c838dbd82443fae99cf0b285aa140aff62945f9", - "url": "https://github.com/docker/compose/releases/download/v2.37.1/docker-compose-windows-aarch64.exe" + "sha256": "1cb0ffdd4dfbf446f0300b96d64d1a18040aadee9e939bb2cdff8623e8613a4f", + "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.37.1" + "version": "2.37.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From eadb5343017e3b976c259cedf1af39b1cc6909f1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 23 Jun 2025 10:04:23 -0700 Subject: [PATCH 501/667] Update 28-rc to 28.3.0-rc.2 --- 28-rc/cli/Dockerfile | 10 +++++----- 28-rc/dind-rootless/Dockerfile | 4 ++-- 28-rc/dind/Dockerfile | 8 ++++---- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- .../windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index d32d13f43..b89883ea5 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.3.0-rc.1 +ENV DOCKER_VERSION 28.3.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile index 2504a0c58..1756c0026 100644 --- a/28-rc/dind-rootless/Dockerfile +++ b/28-rc/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/test/x86_64/docker-rootless-extras-28.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.3.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.3.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile index d2dab14af..cdeb43dfc 100644 --- a/28-rc/dind/Dockerfile +++ b/28-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 25eea6d23..4430dcf30 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/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 28.3.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.1.zip +ENV DOCKER_VERSION 28.3.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.2.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/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index 8e371d065..8eefdc9be 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/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 28.3.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.1.zip +ENV DOCKER_VERSION 28.3.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.2.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/versions.json b/versions.json index 32293f483..6d2fdd621 100644 --- a/versions.json +++ b/versions.json @@ -172,21 +172,21 @@ "28-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.3.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.3.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.3.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.3.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.2.zip" } }, "buildx": { @@ -337,6 +337,6 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "28.3.0-rc.1" + "version": "28.3.0-rc.2" } } From 2a67c3c8af5f43744b23408390280243830613d8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 24 Jun 2025 10:04:19 -0700 Subject: [PATCH 502/667] Update 28 to compose 2.37.3 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 59335aad8..e6359a05e 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.37.2 +ENV DOCKER_COMPOSE_VERSION 2.37.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-x86_64'; \ - sha256='95db7bb2ed5d5fc790a12559b9092d641637c2d0190939c282b52a7af572a8a7'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-x86_64'; \ + sha256='522181c447d831fb23134201d9cdc5cf365f913408124c678089ea62d6a2334c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv6'; \ - sha256='863412d376cb1341e2a6889aa58dc4b674a58350ceccc357c71284109a5cb4a2'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv6'; \ + sha256='06213b27bb8437f7bb306766a89adc8c6f0e39907b9e8774488f16efe4b580ce'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv7'; \ - sha256='33aa26709150e835992a8af58d590e32151473f78daea549ccd70bd5f96c3bbf'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv7'; \ + sha256='2abef7f6a59d5402206f11461b69b6314a5dfdcfdd235b9acfce661d9255f2be'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-aarch64'; \ - sha256='d2c195cf553e55d06761c192133a6a7b4d67d275c7f5ce673bbf8ecf20814061'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-aarch64'; \ + sha256='15646d01e9291e69c9173a0d140d3ef44f912d26ffb2cbeeaf91aeb460dae59e'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-ppc64le'; \ - sha256='6c72243b9585cc741c8e90937fd28ca2c8f2fee8a7636b30d1bbf312df27e157'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-ppc64le'; \ + sha256='1f7f9533bec72a38bc41afa0195189bd42d7be7374922fa40ea7424bab86f375'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-riscv64'; \ - sha256='8448828a5fa46170b92fec62d928b753ba91e86cccace24a04187324b65836ac'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-riscv64'; \ + sha256='1b377c5857be66aa83e77182f83d5527b6c0a8baa30141dba1d8586e2b535baf'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-s390x'; \ - sha256='39d47d8aa2cec059b4dc5e9b627a1176bcce33d9090f237806cf59264fe55e89'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-s390x'; \ + sha256='82549afc300c1318527ff693f22a41114bd7d5e787a63799c85bf511d8428cea'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 189b438d1..7ac4467ae 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4 +ENV DOCKER_COMPOSE_VERSION 2.37.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index a3ed29e31..95e270152 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4 +ENV DOCKER_COMPOSE_VERSION 2.37.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6d2fdd621..3944873cd 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "95db7bb2ed5d5fc790a12559b9092d641637c2d0190939c282b52a7af572a8a7", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-x86_64" + "sha256": "522181c447d831fb23134201d9cdc5cf365f913408124c678089ea62d6a2334c", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "863412d376cb1341e2a6889aa58dc4b674a58350ceccc357c71284109a5cb4a2", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv6" + "sha256": "06213b27bb8437f7bb306766a89adc8c6f0e39907b9e8774488f16efe4b580ce", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "33aa26709150e835992a8af58d590e32151473f78daea549ccd70bd5f96c3bbf", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv7" + "sha256": "2abef7f6a59d5402206f11461b69b6314a5dfdcfdd235b9acfce661d9255f2be", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d2c195cf553e55d06761c192133a6a7b4d67d275c7f5ce673bbf8ecf20814061", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-aarch64" + "sha256": "15646d01e9291e69c9173a0d140d3ef44f912d26ffb2cbeeaf91aeb460dae59e", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "b4ab6151185f8558f931c5a26b9f3495be7eb0044b3915c2abe0409194cc13c3", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-darwin-x86_64" + "sha256": "996801cd0c4e21125f7b07af58901fc2033e9f8dfb486f0d8dd283a59647e88c", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "9ff6ee36bbb1995155995015ea93c2224632cd49da7897eae48908a664f25038", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-darwin-aarch64" + "sha256": "5ad39f8157d638e14d7953e48c333d978305b84b080e571f64563afd4d2ce696", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "6c72243b9585cc741c8e90937fd28ca2c8f2fee8a7636b30d1bbf312df27e157", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-ppc64le" + "sha256": "1f7f9533bec72a38bc41afa0195189bd42d7be7374922fa40ea7424bab86f375", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "8448828a5fa46170b92fec62d928b753ba91e86cccace24a04187324b65836ac", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-riscv64" + "sha256": "1b377c5857be66aa83e77182f83d5527b6c0a8baa30141dba1d8586e2b535baf", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "39d47d8aa2cec059b4dc5e9b627a1176bcce33d9090f237806cf59264fe55e89", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-s390x" + "sha256": "82549afc300c1318527ff693f22a41114bd7d5e787a63799c85bf511d8428cea", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe" + "sha256": "771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "1cb0ffdd4dfbf446f0300b96d64d1a18040aadee9e939bb2cdff8623e8613a4f", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-aarch64.exe" + "sha256": "34a520eb6d3858ce30a14a08dec10c85b71f041582d9dc8cf3b4c6aebf589538", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.37.2" + "version": "2.37.3" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From e28be6fd6d4874a91cc287d7aa60b823d6a77a6b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 24 Jun 2025 10:06:17 -0700 Subject: [PATCH 503/667] Update 28-rc to compose 2.37.3 --- 28-rc/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index b89883ea5..f5792577f 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.37.2 +ENV DOCKER_COMPOSE_VERSION 2.37.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-x86_64'; \ - sha256='95db7bb2ed5d5fc790a12559b9092d641637c2d0190939c282b52a7af572a8a7'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-x86_64'; \ + sha256='522181c447d831fb23134201d9cdc5cf365f913408124c678089ea62d6a2334c'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv6'; \ - sha256='863412d376cb1341e2a6889aa58dc4b674a58350ceccc357c71284109a5cb4a2'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv6'; \ + sha256='06213b27bb8437f7bb306766a89adc8c6f0e39907b9e8774488f16efe4b580ce'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv7'; \ - sha256='33aa26709150e835992a8af58d590e32151473f78daea549ccd70bd5f96c3bbf'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv7'; \ + sha256='2abef7f6a59d5402206f11461b69b6314a5dfdcfdd235b9acfce661d9255f2be'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-aarch64'; \ - sha256='d2c195cf553e55d06761c192133a6a7b4d67d275c7f5ce673bbf8ecf20814061'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-aarch64'; \ + sha256='15646d01e9291e69c9173a0d140d3ef44f912d26ffb2cbeeaf91aeb460dae59e'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-ppc64le'; \ - sha256='6c72243b9585cc741c8e90937fd28ca2c8f2fee8a7636b30d1bbf312df27e157'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-ppc64le'; \ + sha256='1f7f9533bec72a38bc41afa0195189bd42d7be7374922fa40ea7424bab86f375'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-riscv64'; \ - sha256='8448828a5fa46170b92fec62d928b753ba91e86cccace24a04187324b65836ac'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-riscv64'; \ + sha256='1b377c5857be66aa83e77182f83d5527b6c0a8baa30141dba1d8586e2b535baf'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-s390x'; \ - sha256='39d47d8aa2cec059b4dc5e9b627a1176bcce33d9090f237806cf59264fe55e89'; \ + url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-s390x'; \ + sha256='82549afc300c1318527ff693f22a41114bd7d5e787a63799c85bf511d8428cea'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 4430dcf30..ad4efea6b 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4 +ENV DOCKER_COMPOSE_VERSION 2.37.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index 8eefdc9be..6b22517af 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4 +ENV DOCKER_COMPOSE_VERSION 2.37.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 3944873cd..c28bc3947 100644 --- a/versions.json +++ b/versions.json @@ -273,61 +273,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "95db7bb2ed5d5fc790a12559b9092d641637c2d0190939c282b52a7af572a8a7", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-x86_64" + "sha256": "522181c447d831fb23134201d9cdc5cf365f913408124c678089ea62d6a2334c", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "863412d376cb1341e2a6889aa58dc4b674a58350ceccc357c71284109a5cb4a2", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv6" + "sha256": "06213b27bb8437f7bb306766a89adc8c6f0e39907b9e8774488f16efe4b580ce", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "33aa26709150e835992a8af58d590e32151473f78daea549ccd70bd5f96c3bbf", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-armv7" + "sha256": "2abef7f6a59d5402206f11461b69b6314a5dfdcfdd235b9acfce661d9255f2be", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d2c195cf553e55d06761c192133a6a7b4d67d275c7f5ce673bbf8ecf20814061", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-aarch64" + "sha256": "15646d01e9291e69c9173a0d140d3ef44f912d26ffb2cbeeaf91aeb460dae59e", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "b4ab6151185f8558f931c5a26b9f3495be7eb0044b3915c2abe0409194cc13c3", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-darwin-x86_64" + "sha256": "996801cd0c4e21125f7b07af58901fc2033e9f8dfb486f0d8dd283a59647e88c", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "9ff6ee36bbb1995155995015ea93c2224632cd49da7897eae48908a664f25038", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-darwin-aarch64" + "sha256": "5ad39f8157d638e14d7953e48c333d978305b84b080e571f64563afd4d2ce696", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "6c72243b9585cc741c8e90937fd28ca2c8f2fee8a7636b30d1bbf312df27e157", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-ppc64le" + "sha256": "1f7f9533bec72a38bc41afa0195189bd42d7be7374922fa40ea7424bab86f375", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "8448828a5fa46170b92fec62d928b753ba91e86cccace24a04187324b65836ac", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-riscv64" + "sha256": "1b377c5857be66aa83e77182f83d5527b6c0a8baa30141dba1d8586e2b535baf", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "39d47d8aa2cec059b4dc5e9b627a1176bcce33d9090f237806cf59264fe55e89", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-linux-s390x" + "sha256": "82549afc300c1318527ff693f22a41114bd7d5e787a63799c85bf511d8428cea", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "f52bba6d8031da7e01c5bcf621dadea0afa41a317be09f2946701e15e899f8a4", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-x86_64.exe" + "sha256": "771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "1cb0ffdd4dfbf446f0300b96d64d1a18040aadee9e939bb2cdff8623e8613a4f", - "url": "https://github.com/docker/compose/releases/download/v2.37.2/docker-compose-windows-aarch64.exe" + "sha256": "34a520eb6d3858ce30a14a08dec10c85b71f041582d9dc8cf3b4c6aebf589538", + "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.37.2" + "version": "2.37.3" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 6aa52b1fc58b28a25a377b620928f2be8efe2f67 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 24 Jun 2025 22:04:15 -0700 Subject: [PATCH 504/667] Update 28 to 28.3.0 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index e6359a05e..09e097819 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.2.2 +ENV DOCKER_VERSION 28.3.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.2.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.2.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.3.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index d1e1038b0..abc087072 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/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-28.2.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.2.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 3fda7474a..5efc1617a 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.2.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.2.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.3.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 7ac4467ae..c446ed748 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.2.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.2.zip +ENV DOCKER_VERSION 28.3.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.0.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 95e270152..a241fb9e8 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.2.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.2.zip +ENV DOCKER_VERSION 28.3.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.0.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/versions.json b/versions.json index c28bc3947..2040d4766 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.2.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.2.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.3.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.2.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.3.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.2.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.3.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.2.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.2.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.3.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.2.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.3.0.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "28.2.2" + "version": "28.3.0" }, "28-rc": { "arches": { From f3b5b39dada5c3029fe8f57d7c5c0eab6ea7457b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 24 Jun 2025 22:06:08 -0700 Subject: [PATCH 505/667] Update 28-rc --- 28-rc/cli/Dockerfile | 167 ------------ 28-rc/cli/docker-entrypoint.sh | 61 ----- 28-rc/cli/modprobe.sh | 20 -- 28-rc/dind-rootless/Dockerfile | 54 ---- 28-rc/dind/Dockerfile | 108 -------- 28-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 171 +------------ 9 files changed, 1 insertion(+), 1000 deletions(-) delete mode 100644 28-rc/cli/Dockerfile delete mode 100755 28-rc/cli/docker-entrypoint.sh delete mode 100755 28-rc/cli/modprobe.sh delete mode 100644 28-rc/dind-rootless/Dockerfile delete mode 100644 28-rc/dind/Dockerfile delete mode 100755 28-rc/dind/dockerd-entrypoint.sh delete mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile deleted file mode 100644 index f5792577f..000000000 --- a/28-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.22 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 28.3.0-rc.2 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.25.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-amd64'; \ - sha256='4104d79a791a8744c0b43fd5bd0a6172dff29040c5229946a1cdb2d27b0b5bfa'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v6'; \ - sha256='4b92125aa797875108174d9d8ae2e92bdf1db82c97dcf8b3bb72490a62fd8122'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v7'; \ - sha256='0c943fa7001cde147ab7663e36c92259ddde2a3ce0b6f5dfcbc3535dc67f8661'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm64'; \ - sha256='f07063844bb750172c1f25cef61b07a8314d24bedffc015517b3ec4016b16de8'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-ppc64le'; \ - sha256='9ac89d1401b105be41e98760aaaae00e4f44e180e757bf6044d2824ff14788bf'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-riscv64'; \ - sha256='17829ab06c8ec984201170bfb676e6cd311312983814354505fb679b36c02177'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-s390x'; \ - sha256='1b4a7d86fee5b6a48fd153418bd6ed8f0c82bc5d7eb3b219052e834ece977440'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.37.3 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-x86_64'; \ - sha256='522181c447d831fb23134201d9cdc5cf365f913408124c678089ea62d6a2334c'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv6'; \ - sha256='06213b27bb8437f7bb306766a89adc8c6f0e39907b9e8774488f16efe4b580ce'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv7'; \ - sha256='2abef7f6a59d5402206f11461b69b6314a5dfdcfdd235b9acfce661d9255f2be'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-aarch64'; \ - sha256='15646d01e9291e69c9173a0d140d3ef44f912d26ffb2cbeeaf91aeb460dae59e'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-ppc64le'; \ - sha256='1f7f9533bec72a38bc41afa0195189bd42d7be7374922fa40ea7424bab86f375'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-riscv64'; \ - sha256='1b377c5857be66aa83e77182f83d5527b6c0a8baa30141dba1d8586e2b535baf'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-s390x'; \ - sha256='82549afc300c1318527ff693f22a41114bd7d5e787a63799c85bf511d8428cea'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/28-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/28-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile deleted file mode 100644 index 1756c0026..000000000 --- a/28-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-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 -RUN apk add --no-cache iproute2 fuse-overlayfs - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.3.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.3.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile deleted file mode 100644 index cdeb43dfc..000000000 --- a/28-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 8a291dfa5..000000000 --- a/28-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index ad4efea6b..000000000 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.3.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.25.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index 6b22517af..000000000 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.3.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.25.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 2040d4766..e75a5c8a9 100644 --- a/versions.json +++ b/versions.json @@ -169,174 +169,5 @@ ], "version": "28.3.0" }, - "28-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.3.0-rc.2.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.2.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.2.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.3.0-rc.2.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.2.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.25.0.linux-amd64", - "sha256": "4104d79a791a8744c0b43fd5bd0a6172dff29040c5229946a1cdb2d27b0b5bfa", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.25.0.linux-arm-v6", - "sha256": "4b92125aa797875108174d9d8ae2e92bdf1db82c97dcf8b3bb72490a62fd8122", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.25.0.linux-arm-v7", - "sha256": "0c943fa7001cde147ab7663e36c92259ddde2a3ce0b6f5dfcbc3535dc67f8661", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.25.0.linux-arm64", - "sha256": "f07063844bb750172c1f25cef61b07a8314d24bedffc015517b3ec4016b16de8", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.25.0.freebsd-amd64", - "sha256": "45dd1326b045142eee57f9483b62ab3f98baf00db7aa05778703957ddd8639d2", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.25.0.freebsd-arm64", - "sha256": "8d3cb390b75f143c499fe7204efdfc79a69cff1a83ba024212855a1856af38fb", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.25.0.netbsd-amd64", - "sha256": "868d5ba797882c35b9063c2771cb548c18ecbe5022cfdcf97c273a136f2e48d2", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.25.0.netbsd-arm64", - "sha256": "9631901fe021143ff1d9bb27dda61567fe179762de7ccd3800e672d8ee77363a", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.25.0.openbsd-amd64", - "sha256": "81aa95929a7f7826c5c48b5d35883214b944c86127960d653855270ba04ff7ed", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.25.0.openbsd-arm64", - "sha256": "2d0d9b656194bdfa8b5480c8bae89a04a1a437bb99f6a3c512e52aa021710450", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.25.0.linux-ppc64le", - "sha256": "9ac89d1401b105be41e98760aaaae00e4f44e180e757bf6044d2824ff14788bf", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.25.0.linux-riscv64", - "sha256": "17829ab06c8ec984201170bfb676e6cd311312983814354505fb679b36c02177", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.25.0.linux-s390x", - "sha256": "1b4a7d86fee5b6a48fd153418bd6ed8f0c82bc5d7eb3b219052e834ece977440", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.25.0.windows-amd64.exe", - "sha256": "22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.25.0.windows-arm64.exe", - "sha256": "a18f8da7394b9602a4496f64d43bc9dc64884c09760a2218a2e2f90cddb8261d", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-arm64.exe" - } - }, - "version": "0.25.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "522181c447d831fb23134201d9cdc5cf365f913408124c678089ea62d6a2334c", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "06213b27bb8437f7bb306766a89adc8c6f0e39907b9e8774488f16efe4b580ce", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "2abef7f6a59d5402206f11461b69b6314a5dfdcfdd235b9acfce661d9255f2be", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "15646d01e9291e69c9173a0d140d3ef44f912d26ffb2cbeeaf91aeb460dae59e", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "996801cd0c4e21125f7b07af58901fc2033e9f8dfb486f0d8dd283a59647e88c", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "5ad39f8157d638e14d7953e48c333d978305b84b080e571f64563afd4d2ce696", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "1f7f9533bec72a38bc41afa0195189bd42d7be7374922fa40ea7424bab86f375", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "1b377c5857be66aa83e77182f83d5527b6c0a8baa30141dba1d8586e2b535baf", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "82549afc300c1318527ff693f22a41114bd7d5e787a63799c85bf511d8428cea", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "34a520eb6d3858ce30a14a08dec10c85b71f041582d9dc8cf3b4c6aebf589538", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.37.3" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "28.3.0-rc.2" - } + "28-rc": null } From bddecb43d9f238232a55ce93807533116955afc5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 30 Jun 2025 16:04:13 -0700 Subject: [PATCH 506/667] Update 28 to compose 2.38.1 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 09e097819..7b82a652a 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.37.3 +ENV DOCKER_COMPOSE_VERSION 2.38.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-x86_64'; \ - sha256='522181c447d831fb23134201d9cdc5cf365f913408124c678089ea62d6a2334c'; \ + url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-x86_64'; \ + sha256='d94a60549c6916499ce41959941e6c88b67c23ed98d1c5eee2cfc4a2d58aa24b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv6'; \ - sha256='06213b27bb8437f7bb306766a89adc8c6f0e39907b9e8774488f16efe4b580ce'; \ + url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-armv6'; \ + sha256='1025f08f0a91bac695376a118dc95c50bc8a7bb77558bd486a12eeff1aac63b9'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv7'; \ - sha256='2abef7f6a59d5402206f11461b69b6314a5dfdcfdd235b9acfce661d9255f2be'; \ + url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-armv7'; \ + sha256='f9d95a3bf756be4c6be661ab5799e9cb62423d24fd4bf65d9c59fa6ffbc1a525'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-aarch64'; \ - sha256='15646d01e9291e69c9173a0d140d3ef44f912d26ffb2cbeeaf91aeb460dae59e'; \ + url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-aarch64'; \ + sha256='f7e9ed22cf330018cdc3e802e59cacb7fff3520d62aa111ac6640e00597a0ebc'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-ppc64le'; \ - sha256='1f7f9533bec72a38bc41afa0195189bd42d7be7374922fa40ea7424bab86f375'; \ + url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-ppc64le'; \ + sha256='d4994e1b0d5d00c6f09f9f88a7ad135a96d8e48f8fc4238896a152def0a0c65b'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-riscv64'; \ - sha256='1b377c5857be66aa83e77182f83d5527b6c0a8baa30141dba1d8586e2b535baf'; \ + url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-riscv64'; \ + sha256='316569c1e2fb518ea141a1995b4de475ae12332a7e72bfb5a2fe25fa2feaa46b'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-s390x'; \ - sha256='82549afc300c1318527ff693f22a41114bd7d5e787a63799c85bf511d8428cea'; \ + url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-s390x'; \ + sha256='421afc85b17ad6ae4667f209db337d18a8c74f567f99fac6bca0aa0f787697db'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index c446ed748..a4b113b0d 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804 +ENV DOCKER_COMPOSE_VERSION 2.38.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1f50233952bdcef70d4b753112363a67e9af0f56a2eabfc9ba60444879b81638 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index a241fb9e8..9dc280f14 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.37.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804 +ENV DOCKER_COMPOSE_VERSION 2.38.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1f50233952bdcef70d4b753112363a67e9af0f56a2eabfc9ba60444879b81638 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index e75a5c8a9..2cc3d9ee4 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "522181c447d831fb23134201d9cdc5cf365f913408124c678089ea62d6a2334c", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-x86_64" + "sha256": "d94a60549c6916499ce41959941e6c88b67c23ed98d1c5eee2cfc4a2d58aa24b", + "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "06213b27bb8437f7bb306766a89adc8c6f0e39907b9e8774488f16efe4b580ce", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv6" + "sha256": "1025f08f0a91bac695376a118dc95c50bc8a7bb77558bd486a12eeff1aac63b9", + "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "2abef7f6a59d5402206f11461b69b6314a5dfdcfdd235b9acfce661d9255f2be", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-armv7" + "sha256": "f9d95a3bf756be4c6be661ab5799e9cb62423d24fd4bf65d9c59fa6ffbc1a525", + "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "15646d01e9291e69c9173a0d140d3ef44f912d26ffb2cbeeaf91aeb460dae59e", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-aarch64" + "sha256": "f7e9ed22cf330018cdc3e802e59cacb7fff3520d62aa111ac6640e00597a0ebc", + "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "996801cd0c4e21125f7b07af58901fc2033e9f8dfb486f0d8dd283a59647e88c", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-darwin-x86_64" + "sha256": "844c13337fe31cda5ee3f84dad9f99bdddd46c60f29df985da8c57edb4734ada", + "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5ad39f8157d638e14d7953e48c333d978305b84b080e571f64563afd4d2ce696", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-darwin-aarch64" + "sha256": "83a3ea4dc2defcaf14f865feb3ac21602125bc221dad58d6ef08eeea8aed4c03", + "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "1f7f9533bec72a38bc41afa0195189bd42d7be7374922fa40ea7424bab86f375", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-ppc64le" + "sha256": "d4994e1b0d5d00c6f09f9f88a7ad135a96d8e48f8fc4238896a152def0a0c65b", + "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "1b377c5857be66aa83e77182f83d5527b6c0a8baa30141dba1d8586e2b535baf", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-riscv64" + "sha256": "316569c1e2fb518ea141a1995b4de475ae12332a7e72bfb5a2fe25fa2feaa46b", + "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "82549afc300c1318527ff693f22a41114bd7d5e787a63799c85bf511d8428cea", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-linux-s390x" + "sha256": "421afc85b17ad6ae4667f209db337d18a8c74f567f99fac6bca0aa0f787697db", + "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "771fee0bad6dadde4ea68d99ec9aefaffcab2574ad70e64b54560e4e139eb804", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-x86_64.exe" + "sha256": "1f50233952bdcef70d4b753112363a67e9af0f56a2eabfc9ba60444879b81638", + "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "34a520eb6d3858ce30a14a08dec10c85b71f041582d9dc8cf3b4c6aebf589538", - "url": "https://github.com/docker/compose/releases/download/v2.37.3/docker-compose-windows-aarch64.exe" + "sha256": "b063beb4e2de335c60ec8d62407635bac54c2c85b9cbdbfed2a8654cf7f22404", + "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.37.3" + "version": "2.38.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From a916243e36b818461dc38c36a28dfa74d9cdf8bd Mon Sep 17 00:00:00 2001 From: Rob Murray Date: Tue, 1 Jul 2025 12:30:04 +0100 Subject: [PATCH 507/667] Add Alpine package slirp4netns to dind-rootless Rootlesskit's default network driver is vpnkit. With this package added, slirp4netns can be selected as an alternative by starting the container with "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns". Signed-off-by: Rob Murray --- 28/dind-rootless/Dockerfile | 3 ++- Dockerfile-dind-rootless.template | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index abc087072..cfa67b5e3 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/dind-rootless/Dockerfile @@ -8,7 +8,8 @@ FROM docker:28-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 -RUN apk add --no-cache iproute2 fuse-overlayfs +# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns # "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR RUN mkdir /run/user && chmod 1777 /run/user diff --git a/Dockerfile-dind-rootless.template b/Dockerfile-dind-rootless.template index 8668b343a..6f6d5c2a0 100644 --- a/Dockerfile-dind-rootless.template +++ b/Dockerfile-dind-rootless.template @@ -3,7 +3,8 @@ FROM docker:{{ env.version }}-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 -RUN apk add --no-cache iproute2 fuse-overlayfs +# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns # "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR RUN mkdir /run/user && chmod 1777 /run/user From 89f7fcb459efa9cb3d19e33f50c3c2d51d4579c1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 2 Jul 2025 22:04:15 -0700 Subject: [PATCH 508/667] Update 28 to 28.3.1 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 7b82a652a..8df503d7a 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.3.0 +ENV DOCKER_VERSION 28.3.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.3.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index cfa67b5e3..bee1ab50c 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/dind-rootless/Dockerfile @@ -25,10 +25,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-28.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 5efc1617a..4c3db3329 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.3.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index a4b113b0d..030bc4532 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.3.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.0.zip +ENV DOCKER_VERSION 28.3.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.1.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 9dc280f14..3752adfb4 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.3.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.0.zip +ENV DOCKER_VERSION 28.3.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.1.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/versions.json b/versions.json index 2cc3d9ee4..d285a7976 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.3.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.3.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.3.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.3.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.3.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.3.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.3.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.3.1.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "28.3.0" + "version": "28.3.1" }, "28-rc": null } From 072498886bfe721ca5b53fb778883652c66fda10 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 8 Jul 2025 04:04:15 -0700 Subject: [PATCH 509/667] Update 28 to compose 2.38.2 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 8df503d7a..3863b3a1b 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.38.1 +ENV DOCKER_COMPOSE_VERSION 2.38.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-x86_64'; \ - sha256='d94a60549c6916499ce41959941e6c88b67c23ed98d1c5eee2cfc4a2d58aa24b'; \ + url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-x86_64'; \ + sha256='486b3ffc0f806ca2efbc430cef89955386011662f0c76bad17c103d059cfa9cf'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-armv6'; \ - sha256='1025f08f0a91bac695376a118dc95c50bc8a7bb77558bd486a12eeff1aac63b9'; \ + url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-armv6'; \ + sha256='3c572ab8554e37e08cd81850464380bfd276b70528d60dcc734d0934380a10c2'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-armv7'; \ - sha256='f9d95a3bf756be4c6be661ab5799e9cb62423d24fd4bf65d9c59fa6ffbc1a525'; \ + url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-armv7'; \ + sha256='ec4786c5c33393d5e366fd6186cbfa116ae30a083666afefc428e4688a222c27'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-aarch64'; \ - sha256='f7e9ed22cf330018cdc3e802e59cacb7fff3520d62aa111ac6640e00597a0ebc'; \ + url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-aarch64'; \ + sha256='4d0f7678dd3338452beba4518e36a8e22b20cad79ba2535c687da554dc3997fb'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-ppc64le'; \ - sha256='d4994e1b0d5d00c6f09f9f88a7ad135a96d8e48f8fc4238896a152def0a0c65b'; \ + url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-ppc64le'; \ + sha256='4d61ed3f0690c7415bdbe77acf2236121f5a560ff0e41022e2fabecc1690f5a6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-riscv64'; \ - sha256='316569c1e2fb518ea141a1995b4de475ae12332a7e72bfb5a2fe25fa2feaa46b'; \ + url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-riscv64'; \ + sha256='67c65c4015db38b526b262cee9d98915f8fcb56b42be7926a21a7ec2ec0c3d2c'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-s390x'; \ - sha256='421afc85b17ad6ae4667f209db337d18a8c74f567f99fac6bca0aa0f787697db'; \ + url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-s390x'; \ + sha256='e4aaad3a1a444d7e226ffda3df68795a562f9c3cb0b4805a74c2283036e6e7f0'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 030bc4532..d4f9199ae 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.38.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1f50233952bdcef70d4b753112363a67e9af0f56a2eabfc9ba60444879b81638 +ENV DOCKER_COMPOSE_VERSION 2.38.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 ba8f09d3873f7a9755b863ed2013a1276b96fcbbc074c69ff3d3cfbce3e0186f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 3752adfb4..8c60ce635 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.38.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1f50233952bdcef70d4b753112363a67e9af0f56a2eabfc9ba60444879b81638 +ENV DOCKER_COMPOSE_VERSION 2.38.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 ba8f09d3873f7a9755b863ed2013a1276b96fcbbc074c69ff3d3cfbce3e0186f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index d285a7976..2f2ea144e 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "d94a60549c6916499ce41959941e6c88b67c23ed98d1c5eee2cfc4a2d58aa24b", - "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-x86_64" + "sha256": "486b3ffc0f806ca2efbc430cef89955386011662f0c76bad17c103d059cfa9cf", + "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "1025f08f0a91bac695376a118dc95c50bc8a7bb77558bd486a12eeff1aac63b9", - "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-armv6" + "sha256": "3c572ab8554e37e08cd81850464380bfd276b70528d60dcc734d0934380a10c2", + "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "f9d95a3bf756be4c6be661ab5799e9cb62423d24fd4bf65d9c59fa6ffbc1a525", - "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-armv7" + "sha256": "ec4786c5c33393d5e366fd6186cbfa116ae30a083666afefc428e4688a222c27", + "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "f7e9ed22cf330018cdc3e802e59cacb7fff3520d62aa111ac6640e00597a0ebc", - "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-aarch64" + "sha256": "4d0f7678dd3338452beba4518e36a8e22b20cad79ba2535c687da554dc3997fb", + "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "844c13337fe31cda5ee3f84dad9f99bdddd46c60f29df985da8c57edb4734ada", - "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-darwin-x86_64" + "sha256": "2d7ff934f88be52da45e86e5efca286bb879589c0310b025c3c7afd09dfdc82e", + "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "83a3ea4dc2defcaf14f865feb3ac21602125bc221dad58d6ef08eeea8aed4c03", - "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-darwin-aarch64" + "sha256": "d3af9d008da340f355df89d16361a6c19a363c33e7b7ab145a81b76aa2ed9b86", + "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "d4994e1b0d5d00c6f09f9f88a7ad135a96d8e48f8fc4238896a152def0a0c65b", - "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-ppc64le" + "sha256": "4d61ed3f0690c7415bdbe77acf2236121f5a560ff0e41022e2fabecc1690f5a6", + "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "316569c1e2fb518ea141a1995b4de475ae12332a7e72bfb5a2fe25fa2feaa46b", - "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-riscv64" + "sha256": "67c65c4015db38b526b262cee9d98915f8fcb56b42be7926a21a7ec2ec0c3d2c", + "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "421afc85b17ad6ae4667f209db337d18a8c74f567f99fac6bca0aa0f787697db", - "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-linux-s390x" + "sha256": "e4aaad3a1a444d7e226ffda3df68795a562f9c3cb0b4805a74c2283036e6e7f0", + "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "1f50233952bdcef70d4b753112363a67e9af0f56a2eabfc9ba60444879b81638", - "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-windows-x86_64.exe" + "sha256": "ba8f09d3873f7a9755b863ed2013a1276b96fcbbc074c69ff3d3cfbce3e0186f", + "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "b063beb4e2de335c60ec8d62407635bac54c2c85b9cbdbfed2a8654cf7f22404", - "url": "https://github.com/docker/compose/releases/download/v2.38.1/docker-compose-windows-aarch64.exe" + "sha256": "3517fa88873214ce21bd23e8b250028af434bf9a9a64af8048db88924314399b", + "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.38.1" + "version": "2.38.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 970a23424906f35f372532787bd20259e5090888 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 9 Jul 2025 16:04:15 -0700 Subject: [PATCH 510/667] Update 28 to 28.3.2 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 3863b3a1b..2e7780dd0 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.3.1 +ENV DOCKER_VERSION 28.3.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.3.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index bee1ab50c..2df4eb4b3 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/dind-rootless/Dockerfile @@ -25,10 +25,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-28.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 4c3db3329..63dc5df72 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.3.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index d4f9199ae..01fbd317f 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.3.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.1.zip +ENV DOCKER_VERSION 28.3.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.2.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 8c60ce635..f01cc25d8 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.3.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.1.zip +ENV DOCKER_VERSION 28.3.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.2.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/versions.json b/versions.json index 2f2ea144e..314bd46e6 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.3.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.3.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.3.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.3.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.3.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.3.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.3.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.3.2.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "28.3.1" + "version": "28.3.2" }, "28-rc": null } From 57bc3ac83209527653ba4abe6912df5d7c071daa Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 21 Jul 2025 10:04:14 -0700 Subject: [PATCH 511/667] Update 28 to buildx 0.26.0 --- 28/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 2e7780dd0..59f03b0a7 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.25.0 +ENV DOCKER_BUILDX_VERSION 0.26.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-amd64'; \ - sha256='4104d79a791a8744c0b43fd5bd0a6172dff29040c5229946a1cdb2d27b0b5bfa'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-amd64'; \ + sha256='a918c0b8bef7c710a1c6fd74d2d0fce22880226d7662476bd97a82390ce87368'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v6'; \ - sha256='4b92125aa797875108174d9d8ae2e92bdf1db82c97dcf8b3bb72490a62fd8122'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm-v6'; \ + sha256='ce81171133ef280d50ef927e6114f2e30a630ae6dd95dd7ca6b6fde10b136511'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v7'; \ - sha256='0c943fa7001cde147ab7663e36c92259ddde2a3ce0b6f5dfcbc3535dc67f8661'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm-v7'; \ + sha256='382840ab91992023bbba7f8a7cf770d132856be21219d1c2e23b443535a30443'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm64'; \ - sha256='f07063844bb750172c1f25cef61b07a8314d24bedffc015517b3ec4016b16de8'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm64'; \ + sha256='1685db43ee1131cba9ffab605b68ff418353181454da75b76a8a335fee8553e1'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-ppc64le'; \ - sha256='9ac89d1401b105be41e98760aaaae00e4f44e180e757bf6044d2824ff14788bf'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-ppc64le'; \ + sha256='cbb7ca85b28473a86a9e535c853a68ccafd92f4811cf4bb97873c4ecffb5a7bf'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-riscv64'; \ - sha256='17829ab06c8ec984201170bfb676e6cd311312983814354505fb679b36c02177'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-riscv64'; \ + sha256='58822a6a4483b08df5df8366f70d8fe57147f35df81c8b722e853129ff1eb0a0'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-s390x'; \ - sha256='1b4a7d86fee5b6a48fd153418bd6ed8f0c82bc5d7eb3b219052e834ece977440'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-s390x'; \ + sha256='e1512f7d0d620d511001bfa2072a6222e47a3433bbd1c9404d9bc0d2b377ea9b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 01fbd317f..c47a0bacf 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.25.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb +ENV DOCKER_BUILDX_VERSION 0.26.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 af36273e6268fbedd9d86755d613309682eee6780c6dba237a429c571faab985 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index f01cc25d8..d4b19eb79 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.25.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb +ENV DOCKER_BUILDX_VERSION 0.26.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 af36273e6268fbedd9d86755d613309682eee6780c6dba237a429c571faab985 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 314bd46e6..5d42d105b 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.25.0.linux-amd64", - "sha256": "4104d79a791a8744c0b43fd5bd0a6172dff29040c5229946a1cdb2d27b0b5bfa", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-amd64" + "file": "buildx-v0.26.0.linux-amd64", + "sha256": "a918c0b8bef7c710a1c6fd74d2d0fce22880226d7662476bd97a82390ce87368", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.25.0.linux-arm-v6", - "sha256": "4b92125aa797875108174d9d8ae2e92bdf1db82c97dcf8b3bb72490a62fd8122", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v6" + "file": "buildx-v0.26.0.linux-arm-v6", + "sha256": "ce81171133ef280d50ef927e6114f2e30a630ae6dd95dd7ca6b6fde10b136511", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.25.0.linux-arm-v7", - "sha256": "0c943fa7001cde147ab7663e36c92259ddde2a3ce0b6f5dfcbc3535dc67f8661", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v7" + "file": "buildx-v0.26.0.linux-arm-v7", + "sha256": "382840ab91992023bbba7f8a7cf770d132856be21219d1c2e23b443535a30443", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.25.0.linux-arm64", - "sha256": "f07063844bb750172c1f25cef61b07a8314d24bedffc015517b3ec4016b16de8", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm64" + "file": "buildx-v0.26.0.linux-arm64", + "sha256": "1685db43ee1131cba9ffab605b68ff418353181454da75b76a8a335fee8553e1", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.25.0.freebsd-amd64", - "sha256": "45dd1326b045142eee57f9483b62ab3f98baf00db7aa05778703957ddd8639d2", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.freebsd-amd64" + "file": "buildx-v0.26.0.freebsd-amd64", + "sha256": "722e3a01fbff8e3cdc16ab2f284946a97fb9663e53335df054a8558746eb2b78", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.25.0.freebsd-arm64", - "sha256": "8d3cb390b75f143c499fe7204efdfc79a69cff1a83ba024212855a1856af38fb", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.freebsd-arm64" + "file": "buildx-v0.26.0.freebsd-arm64", + "sha256": "fc465d2b45a133804804dd67ef0b8666d477a9b8ab2a780fed3c967bde7bd1bd", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.25.0.netbsd-amd64", - "sha256": "868d5ba797882c35b9063c2771cb548c18ecbe5022cfdcf97c273a136f2e48d2", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.netbsd-amd64" + "file": "buildx-v0.26.0.netbsd-amd64", + "sha256": "91666c64cb3784491522f627bbd02ef0d8c23fcddc07cba6b025e4f3453c9df3", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.25.0.netbsd-arm64", - "sha256": "9631901fe021143ff1d9bb27dda61567fe179762de7ccd3800e672d8ee77363a", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.netbsd-arm64" + "file": "buildx-v0.26.0.netbsd-arm64", + "sha256": "e61f06fc5d0e7db728516fb8c1671d912af7a47f4ba536cc4e254295576f9e88", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.25.0.openbsd-amd64", - "sha256": "81aa95929a7f7826c5c48b5d35883214b944c86127960d653855270ba04ff7ed", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.openbsd-amd64" + "file": "buildx-v0.26.0.openbsd-amd64", + "sha256": "1dea6a24fee6f07f7d786ac273420fdf53b38a8ad57e6e5d6f7af32fab1928d9", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.25.0.openbsd-arm64", - "sha256": "2d0d9b656194bdfa8b5480c8bae89a04a1a437bb99f6a3c512e52aa021710450", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.openbsd-arm64" + "file": "buildx-v0.26.0.openbsd-arm64", + "sha256": "e7fb0f220c8e5a7353cf31cd7d65ece3eb4dbc70137c02b0ad6aaadbc781c1c8", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.25.0.linux-ppc64le", - "sha256": "9ac89d1401b105be41e98760aaaae00e4f44e180e757bf6044d2824ff14788bf", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-ppc64le" + "file": "buildx-v0.26.0.linux-ppc64le", + "sha256": "cbb7ca85b28473a86a9e535c853a68ccafd92f4811cf4bb97873c4ecffb5a7bf", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.25.0.linux-riscv64", - "sha256": "17829ab06c8ec984201170bfb676e6cd311312983814354505fb679b36c02177", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-riscv64" + "file": "buildx-v0.26.0.linux-riscv64", + "sha256": "58822a6a4483b08df5df8366f70d8fe57147f35df81c8b722e853129ff1eb0a0", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.25.0.linux-s390x", - "sha256": "1b4a7d86fee5b6a48fd153418bd6ed8f0c82bc5d7eb3b219052e834ece977440", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-s390x" + "file": "buildx-v0.26.0.linux-s390x", + "sha256": "e1512f7d0d620d511001bfa2072a6222e47a3433bbd1c9404d9bc0d2b377ea9b", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.25.0.windows-amd64.exe", - "sha256": "22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe" + "file": "buildx-v0.26.0.windows-amd64.exe", + "sha256": "af36273e6268fbedd9d86755d613309682eee6780c6dba237a429c571faab985", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.25.0.windows-arm64.exe", - "sha256": "a18f8da7394b9602a4496f64d43bc9dc64884c09760a2218a2e2f90cddb8261d", - "url": "https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-arm64.exe" + "file": "buildx-v0.26.0.windows-arm64.exe", + "sha256": "16563d4a0aef32e8550548795933704e65b979cdd506d6e540280e87c3d5b6c1", + "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.windows-arm64.exe" } }, - "version": "0.25.0" + "version": "0.26.0" }, "compose": { "arches": { From ce365f438f60cb026022b6e3d01f91edf4fee7af Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 22 Jul 2025 09:28:46 -0700 Subject: [PATCH 512/667] Update 28 to buildx 0.26.1 --- 28/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 59f03b0a7..72fe8285d 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.26.0 +ENV DOCKER_BUILDX_VERSION 0.26.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-amd64'; \ - sha256='a918c0b8bef7c710a1c6fd74d2d0fce22880226d7662476bd97a82390ce87368'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-amd64'; \ + sha256='9451034b6ca5354e8bf88a2002a413aedabf110fd0f12ebb0b2f2cc241be8e41'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm-v6'; \ - sha256='ce81171133ef280d50ef927e6114f2e30a630ae6dd95dd7ca6b6fde10b136511'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm-v6'; \ + sha256='e9f89ed92231e937b380afc8f0105dc57e1fd5a3949a1545e863312706bf2947'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm-v7'; \ - sha256='382840ab91992023bbba7f8a7cf770d132856be21219d1c2e23b443535a30443'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm-v7'; \ + sha256='92fe156e22eabbb58fb6b44aa3c59c2c06a820b66913158ed209ef5e18abc356'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm64'; \ - sha256='1685db43ee1131cba9ffab605b68ff418353181454da75b76a8a335fee8553e1'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm64'; \ + sha256='b610d3c24836b2e7fecab5ef2c9466239a0f0156993a0406ea58943b87bff918'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-ppc64le'; \ - sha256='cbb7ca85b28473a86a9e535c853a68ccafd92f4811cf4bb97873c4ecffb5a7bf'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-ppc64le'; \ + sha256='74a9c8856ef7e742b5193358b43c8dbea9dc739009e4894c840fdb0a9c746d0d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-riscv64'; \ - sha256='58822a6a4483b08df5df8366f70d8fe57147f35df81c8b722e853129ff1eb0a0'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-riscv64'; \ + sha256='698496a08f9c008230e858c63590aeb44b4806df2d6f02cd0b382137ce9394c6'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-s390x'; \ - sha256='e1512f7d0d620d511001bfa2072a6222e47a3433bbd1c9404d9bc0d2b377ea9b'; \ + url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-s390x'; \ + sha256='6b561cb99d105114484897a3bc3f105dead11d4c14f28ffbf0873ce7fd1fe2d6'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index c47a0bacf..1d8b6f904 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.26.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 af36273e6268fbedd9d86755d613309682eee6780c6dba237a429c571faab985 +ENV DOCKER_BUILDX_VERSION 0.26.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 7920bc77bdcad5d6bfb02e530ed67b8dfa550b77ae79e080ac4ee9424a75acea RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index d4b19eb79..8b7ea720f 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.26.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 af36273e6268fbedd9d86755d613309682eee6780c6dba237a429c571faab985 +ENV DOCKER_BUILDX_VERSION 0.26.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 7920bc77bdcad5d6bfb02e530ed67b8dfa550b77ae79e080ac4ee9424a75acea RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 5d42d105b..692d1cc1d 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.26.0.linux-amd64", - "sha256": "a918c0b8bef7c710a1c6fd74d2d0fce22880226d7662476bd97a82390ce87368", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-amd64" + "file": "buildx-v0.26.1.linux-amd64", + "sha256": "9451034b6ca5354e8bf88a2002a413aedabf110fd0f12ebb0b2f2cc241be8e41", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.26.0.linux-arm-v6", - "sha256": "ce81171133ef280d50ef927e6114f2e30a630ae6dd95dd7ca6b6fde10b136511", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm-v6" + "file": "buildx-v0.26.1.linux-arm-v6", + "sha256": "e9f89ed92231e937b380afc8f0105dc57e1fd5a3949a1545e863312706bf2947", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.26.0.linux-arm-v7", - "sha256": "382840ab91992023bbba7f8a7cf770d132856be21219d1c2e23b443535a30443", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm-v7" + "file": "buildx-v0.26.1.linux-arm-v7", + "sha256": "92fe156e22eabbb58fb6b44aa3c59c2c06a820b66913158ed209ef5e18abc356", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.26.0.linux-arm64", - "sha256": "1685db43ee1131cba9ffab605b68ff418353181454da75b76a8a335fee8553e1", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-arm64" + "file": "buildx-v0.26.1.linux-arm64", + "sha256": "b610d3c24836b2e7fecab5ef2c9466239a0f0156993a0406ea58943b87bff918", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.26.0.freebsd-amd64", - "sha256": "722e3a01fbff8e3cdc16ab2f284946a97fb9663e53335df054a8558746eb2b78", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.freebsd-amd64" + "file": "buildx-v0.26.1.freebsd-amd64", + "sha256": "845637ec2e6d2207ec0b6a2879ebef268140acd78aac6487665af724a443877b", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.26.0.freebsd-arm64", - "sha256": "fc465d2b45a133804804dd67ef0b8666d477a9b8ab2a780fed3c967bde7bd1bd", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.freebsd-arm64" + "file": "buildx-v0.26.1.freebsd-arm64", + "sha256": "56bcd03d4334ac4f81e45bda52fa4ba4c5e6ae5759385f2e6264920d53c5d185", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.26.0.netbsd-amd64", - "sha256": "91666c64cb3784491522f627bbd02ef0d8c23fcddc07cba6b025e4f3453c9df3", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.netbsd-amd64" + "file": "buildx-v0.26.1.netbsd-amd64", + "sha256": "4ba1e369fe2ed8e333c8f002d63cdefcc76404519b9f98c177dd754c3a42b7df", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.26.0.netbsd-arm64", - "sha256": "e61f06fc5d0e7db728516fb8c1671d912af7a47f4ba536cc4e254295576f9e88", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.netbsd-arm64" + "file": "buildx-v0.26.1.netbsd-arm64", + "sha256": "c759ac9e66337d32822e8358e9f0631e9f5a7cedb000ca1951f5934e404aea8a", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.26.0.openbsd-amd64", - "sha256": "1dea6a24fee6f07f7d786ac273420fdf53b38a8ad57e6e5d6f7af32fab1928d9", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.openbsd-amd64" + "file": "buildx-v0.26.1.openbsd-amd64", + "sha256": "f86f20ff2dec745631ad71d1f231b16c4ea69538ec7df1c01b89f216d3d42dd0", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.26.0.openbsd-arm64", - "sha256": "e7fb0f220c8e5a7353cf31cd7d65ece3eb4dbc70137c02b0ad6aaadbc781c1c8", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.openbsd-arm64" + "file": "buildx-v0.26.1.openbsd-arm64", + "sha256": "0d34a2be144639a1f8fefa818c44abfbdaf83b3dc67fc1e0380c3dc93ba4f5a9", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.26.0.linux-ppc64le", - "sha256": "cbb7ca85b28473a86a9e535c853a68ccafd92f4811cf4bb97873c4ecffb5a7bf", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-ppc64le" + "file": "buildx-v0.26.1.linux-ppc64le", + "sha256": "74a9c8856ef7e742b5193358b43c8dbea9dc739009e4894c840fdb0a9c746d0d", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.26.0.linux-riscv64", - "sha256": "58822a6a4483b08df5df8366f70d8fe57147f35df81c8b722e853129ff1eb0a0", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-riscv64" + "file": "buildx-v0.26.1.linux-riscv64", + "sha256": "698496a08f9c008230e858c63590aeb44b4806df2d6f02cd0b382137ce9394c6", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.26.0.linux-s390x", - "sha256": "e1512f7d0d620d511001bfa2072a6222e47a3433bbd1c9404d9bc0d2b377ea9b", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.linux-s390x" + "file": "buildx-v0.26.1.linux-s390x", + "sha256": "6b561cb99d105114484897a3bc3f105dead11d4c14f28ffbf0873ce7fd1fe2d6", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.26.0.windows-amd64.exe", - "sha256": "af36273e6268fbedd9d86755d613309682eee6780c6dba237a429c571faab985", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.windows-amd64.exe" + "file": "buildx-v0.26.1.windows-amd64.exe", + "sha256": "7920bc77bdcad5d6bfb02e530ed67b8dfa550b77ae79e080ac4ee9424a75acea", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.26.0.windows-arm64.exe", - "sha256": "16563d4a0aef32e8550548795933704e65b979cdd506d6e540280e87c3d5b6c1", - "url": "https://github.com/docker/buildx/releases/download/v0.26.0/buildx-v0.26.0.windows-arm64.exe" + "file": "buildx-v0.26.1.windows-arm64.exe", + "sha256": "caef69c5a6f12ed819a9e6e4d7ed948f89dc0bdeb9035534c280e93faddb920a", + "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.windows-arm64.exe" } }, - "version": "0.26.0" + "version": "0.26.1" }, "compose": { "arches": { From d29e922eb0317f80f30a7ef63b9f9e42a5542556 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 24 Jul 2025 04:04:12 -0700 Subject: [PATCH 513/667] Update 28 to compose 2.39.0 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 72fe8285d..45b4d6601 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.38.2 +ENV DOCKER_COMPOSE_VERSION 2.39.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-x86_64'; \ - sha256='486b3ffc0f806ca2efbc430cef89955386011662f0c76bad17c103d059cfa9cf'; \ + url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-x86_64'; \ + sha256='56cad0ed632214fe3f77afd349a33e56fcec6e25f458210b8e9c6b9b33502a5a'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-armv6'; \ - sha256='3c572ab8554e37e08cd81850464380bfd276b70528d60dcc734d0934380a10c2'; \ + url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-armv6'; \ + sha256='d54f81cd5ae68848287a954158855f0aeb2938e6a465498d1e1bc2a6f2d0834f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-armv7'; \ - sha256='ec4786c5c33393d5e366fd6186cbfa116ae30a083666afefc428e4688a222c27'; \ + url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-armv7'; \ + sha256='ee9d71a8e953bed3fe34689a426eda615aea84642940038cdfdbdc76a8703dec'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-aarch64'; \ - sha256='4d0f7678dd3338452beba4518e36a8e22b20cad79ba2535c687da554dc3997fb'; \ + url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-aarch64'; \ + sha256='1d8780c5bdfcd7696861578f9c66d16dd603a4b8af31588c7c3ac4467f850756'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-ppc64le'; \ - sha256='4d61ed3f0690c7415bdbe77acf2236121f5a560ff0e41022e2fabecc1690f5a6'; \ + url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-ppc64le'; \ + sha256='acbe2af3a0aba654dd870a6a5d0b42276d2f1b32d7a069e3d121ace2446eaed2'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-riscv64'; \ - sha256='67c65c4015db38b526b262cee9d98915f8fcb56b42be7926a21a7ec2ec0c3d2c'; \ + url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-riscv64'; \ + sha256='3e39c59e9534da95f983e46a5024e1cc6c37f31a94d5e46ece4a8e649628bbab'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-s390x'; \ - sha256='e4aaad3a1a444d7e226ffda3df68795a562f9c3cb0b4805a74c2283036e6e7f0'; \ + url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-s390x'; \ + sha256='eedb352c89a64eb48d814c63caf6c089c62466d839ce97b96865d44111e4efda'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 1d8b6f904..d90e5c9ae 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.38.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 ba8f09d3873f7a9755b863ed2013a1276b96fcbbc074c69ff3d3cfbce3e0186f +ENV DOCKER_COMPOSE_VERSION 2.39.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 42f8d1a03c32fdf73ec2c10c2c9d4f75e430da798ec94743d86f188c5155c621 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 8b7ea720f..6e525e136 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.38.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 ba8f09d3873f7a9755b863ed2013a1276b96fcbbc074c69ff3d3cfbce3e0186f +ENV DOCKER_COMPOSE_VERSION 2.39.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 42f8d1a03c32fdf73ec2c10c2c9d4f75e430da798ec94743d86f188c5155c621 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 692d1cc1d..23caec334 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "486b3ffc0f806ca2efbc430cef89955386011662f0c76bad17c103d059cfa9cf", - "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-x86_64" + "sha256": "56cad0ed632214fe3f77afd349a33e56fcec6e25f458210b8e9c6b9b33502a5a", + "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "3c572ab8554e37e08cd81850464380bfd276b70528d60dcc734d0934380a10c2", - "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-armv6" + "sha256": "d54f81cd5ae68848287a954158855f0aeb2938e6a465498d1e1bc2a6f2d0834f", + "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "ec4786c5c33393d5e366fd6186cbfa116ae30a083666afefc428e4688a222c27", - "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-armv7" + "sha256": "ee9d71a8e953bed3fe34689a426eda615aea84642940038cdfdbdc76a8703dec", + "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "4d0f7678dd3338452beba4518e36a8e22b20cad79ba2535c687da554dc3997fb", - "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-aarch64" + "sha256": "1d8780c5bdfcd7696861578f9c66d16dd603a4b8af31588c7c3ac4467f850756", + "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "2d7ff934f88be52da45e86e5efca286bb879589c0310b025c3c7afd09dfdc82e", - "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-darwin-x86_64" + "sha256": "f515722f11096ceee57b3f908b52741f14478e184abcc702f50f5d73bf2b42c2", + "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "d3af9d008da340f355df89d16361a6c19a363c33e7b7ab145a81b76aa2ed9b86", - "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-darwin-aarch64" + "sha256": "2a8b3a93132a4dfe884d011782ee0ac04579cc874f10315b38a900450ef1b752", + "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "4d61ed3f0690c7415bdbe77acf2236121f5a560ff0e41022e2fabecc1690f5a6", - "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-ppc64le" + "sha256": "acbe2af3a0aba654dd870a6a5d0b42276d2f1b32d7a069e3d121ace2446eaed2", + "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "67c65c4015db38b526b262cee9d98915f8fcb56b42be7926a21a7ec2ec0c3d2c", - "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-riscv64" + "sha256": "3e39c59e9534da95f983e46a5024e1cc6c37f31a94d5e46ece4a8e649628bbab", + "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "e4aaad3a1a444d7e226ffda3df68795a562f9c3cb0b4805a74c2283036e6e7f0", - "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-linux-s390x" + "sha256": "eedb352c89a64eb48d814c63caf6c089c62466d839ce97b96865d44111e4efda", + "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "ba8f09d3873f7a9755b863ed2013a1276b96fcbbc074c69ff3d3cfbce3e0186f", - "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-windows-x86_64.exe" + "sha256": "42f8d1a03c32fdf73ec2c10c2c9d4f75e430da798ec94743d86f188c5155c621", + "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "3517fa88873214ce21bd23e8b250028af434bf9a9a64af8048db88924314399b", - "url": "https://github.com/docker/compose/releases/download/v2.38.2/docker-compose-windows-aarch64.exe" + "sha256": "efa2e51627d1072dd2383233cffe397b2be9a08a4727bba79e829bb5955f8ff3", + "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.38.2" + "version": "2.39.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 43846ae8bfe7ca7f46d9d49a098be861374b12d8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 24 Jul 2025 10:04:15 -0700 Subject: [PATCH 514/667] Update 28 to compose 2.39.1 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 45b4d6601..58c72ae0b 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.39.0 +ENV DOCKER_COMPOSE_VERSION 2.39.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-x86_64'; \ - sha256='56cad0ed632214fe3f77afd349a33e56fcec6e25f458210b8e9c6b9b33502a5a'; \ + url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-x86_64'; \ + sha256='a5ea28722d5da628b59226626f7d6c33c89a7ed19e39f750645925242044c9d2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-armv6'; \ - sha256='d54f81cd5ae68848287a954158855f0aeb2938e6a465498d1e1bc2a6f2d0834f'; \ + url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-armv6'; \ + sha256='14a8a2fd5ca75cf87a9c33f79eea5b51701d3a2039387ae48440c9d78b2c83c2'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-armv7'; \ - sha256='ee9d71a8e953bed3fe34689a426eda615aea84642940038cdfdbdc76a8703dec'; \ + url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-armv7'; \ + sha256='a97c785b148cf744e4f91835fa981dc93d6ced5132d42dab934947e33032af98'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-aarch64'; \ - sha256='1d8780c5bdfcd7696861578f9c66d16dd603a4b8af31588c7c3ac4467f850756'; \ + url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-aarch64'; \ + sha256='7b2627ed76f7dcb0d93f649f185af912372229b4c09762a3cd1db5be5255632b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-ppc64le'; \ - sha256='acbe2af3a0aba654dd870a6a5d0b42276d2f1b32d7a069e3d121ace2446eaed2'; \ + url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-ppc64le'; \ + sha256='a2c76f4ea8cbba5906cfe9e97fc67463ad954813dfbddf341bf5062c5c0c93ec'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-riscv64'; \ - sha256='3e39c59e9534da95f983e46a5024e1cc6c37f31a94d5e46ece4a8e649628bbab'; \ + url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-riscv64'; \ + sha256='3e54325b4019398e058be3cd8589b9ecc98a1a97b7fe8f3280ee4e25281091e2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-s390x'; \ - sha256='eedb352c89a64eb48d814c63caf6c089c62466d839ce97b96865d44111e4efda'; \ + url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-s390x'; \ + sha256='87e75c7ffd019507c823c49d83fac62eda239e55544bb56d7707c817f52acc69'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index d90e5c9ae..76dfa0fc4 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 42f8d1a03c32fdf73ec2c10c2c9d4f75e430da798ec94743d86f188c5155c621 +ENV DOCKER_COMPOSE_VERSION 2.39.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5e0ae2df1651c6bed38c5367d0d84d5169537ef5426b2ee32f34e4166233efa7 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 6e525e136..a20dc8217 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 42f8d1a03c32fdf73ec2c10c2c9d4f75e430da798ec94743d86f188c5155c621 +ENV DOCKER_COMPOSE_VERSION 2.39.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5e0ae2df1651c6bed38c5367d0d84d5169537ef5426b2ee32f34e4166233efa7 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 23caec334..a3bbed375 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "56cad0ed632214fe3f77afd349a33e56fcec6e25f458210b8e9c6b9b33502a5a", - "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-x86_64" + "sha256": "a5ea28722d5da628b59226626f7d6c33c89a7ed19e39f750645925242044c9d2", + "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "d54f81cd5ae68848287a954158855f0aeb2938e6a465498d1e1bc2a6f2d0834f", - "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-armv6" + "sha256": "14a8a2fd5ca75cf87a9c33f79eea5b51701d3a2039387ae48440c9d78b2c83c2", + "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "ee9d71a8e953bed3fe34689a426eda615aea84642940038cdfdbdc76a8703dec", - "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-armv7" + "sha256": "a97c785b148cf744e4f91835fa981dc93d6ced5132d42dab934947e33032af98", + "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "1d8780c5bdfcd7696861578f9c66d16dd603a4b8af31588c7c3ac4467f850756", - "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-aarch64" + "sha256": "7b2627ed76f7dcb0d93f649f185af912372229b4c09762a3cd1db5be5255632b", + "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "f515722f11096ceee57b3f908b52741f14478e184abcc702f50f5d73bf2b42c2", - "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-darwin-x86_64" + "sha256": "d8e3831e95285e9b7995be68b6efa2546a2eb4b8138abbdb7abd64c8986f5f0f", + "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "2a8b3a93132a4dfe884d011782ee0ac04579cc874f10315b38a900450ef1b752", - "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-darwin-aarch64" + "sha256": "09fa8ee53514b11573f810eb64f78199fd11c66b29c54bf6be3b59563ca75740", + "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "acbe2af3a0aba654dd870a6a5d0b42276d2f1b32d7a069e3d121ace2446eaed2", - "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-ppc64le" + "sha256": "a2c76f4ea8cbba5906cfe9e97fc67463ad954813dfbddf341bf5062c5c0c93ec", + "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "3e39c59e9534da95f983e46a5024e1cc6c37f31a94d5e46ece4a8e649628bbab", - "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-riscv64" + "sha256": "3e54325b4019398e058be3cd8589b9ecc98a1a97b7fe8f3280ee4e25281091e2", + "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "eedb352c89a64eb48d814c63caf6c089c62466d839ce97b96865d44111e4efda", - "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-linux-s390x" + "sha256": "87e75c7ffd019507c823c49d83fac62eda239e55544bb56d7707c817f52acc69", + "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "42f8d1a03c32fdf73ec2c10c2c9d4f75e430da798ec94743d86f188c5155c621", - "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-windows-x86_64.exe" + "sha256": "5e0ae2df1651c6bed38c5367d0d84d5169537ef5426b2ee32f34e4166233efa7", + "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "efa2e51627d1072dd2383233cffe397b2be9a08a4727bba79e829bb5955f8ff3", - "url": "https://github.com/docker/compose/releases/download/v2.39.0/docker-compose-windows-aarch64.exe" + "sha256": "199de3889471da98b3f67297f4a7e244177315f5603308abf5f25ad6502ccacb", + "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.39.0" + "version": "2.39.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 7d789f6d3ca9d6cef6c7cbcbbefbd6483ee3d2cd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 29 Jul 2025 04:04:14 -0700 Subject: [PATCH 515/667] Update 28 to 28.3.3 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 58c72ae0b..735e7ef45 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.3.2 +ENV DOCKER_VERSION 28.3.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.3.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.3.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index 2df4eb4b3..7fef8581d 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/dind-rootless/Dockerfile @@ -25,10 +25,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-28.3.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 63dc5df72..a7124842d 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.3.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.3.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 76dfa0fc4..9b9e71348 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.3.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.2.zip +ENV DOCKER_VERSION 28.3.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.3.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index a20dc8217..7325ed60d 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.3.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.2.zip +ENV DOCKER_VERSION 28.3.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.3.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/versions.json b/versions.json index a3bbed375..01d80a53d 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.3.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.3.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.3.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.3.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.3.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.3.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.3.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.3.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.3.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.3.3.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "28.3.2" + "version": "28.3.3" }, "28-rc": null } From 1e17180cea33b7a6d9f06442e708c1a094974ae6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 8 Aug 2025 10:04:14 -0700 Subject: [PATCH 516/667] Update 28 to compose 2.39.2 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 735e7ef45..9ddfa2d16 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.39.1 +ENV DOCKER_COMPOSE_VERSION 2.39.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-x86_64'; \ - sha256='a5ea28722d5da628b59226626f7d6c33c89a7ed19e39f750645925242044c9d2'; \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-x86_64'; \ + sha256='a55a8cd4ef103aac282812554e531aac8df7e914a287ee81e14d695556a22902'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-armv6'; \ - sha256='14a8a2fd5ca75cf87a9c33f79eea5b51701d3a2039387ae48440c9d78b2c83c2'; \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv6'; \ + sha256='a9fefb9f377d11416db7d653fac3c0ed8c61a0ef99c8e17369114b88ac48ab50'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-armv7'; \ - sha256='a97c785b148cf744e4f91835fa981dc93d6ced5132d42dab934947e33032af98'; \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv7'; \ + sha256='9d1376146e42bf964f9efa8444935bc20accdc1d72a6ea44881b8d86c9ccfda9'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-aarch64'; \ - sha256='7b2627ed76f7dcb0d93f649f185af912372229b4c09762a3cd1db5be5255632b'; \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-aarch64'; \ + sha256='54488fffb60782f3c8787a48b95ed15f49f5a3a85f4105304bd46db5edd9db61'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-ppc64le'; \ - sha256='a2c76f4ea8cbba5906cfe9e97fc67463ad954813dfbddf341bf5062c5c0c93ec'; \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-ppc64le'; \ + sha256='83a02be63cb047207a6efbd39af13d05b8d38065617764dddc3f6e5d36161d03'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-riscv64'; \ - sha256='3e54325b4019398e058be3cd8589b9ecc98a1a97b7fe8f3280ee4e25281091e2'; \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-riscv64'; \ + sha256='911f9a00366a619e15bb56fe37f6a09eddc30dc1d9f704309185fd2eec0fb3f9'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-s390x'; \ - sha256='87e75c7ffd019507c823c49d83fac62eda239e55544bb56d7707c817f52acc69'; \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-s390x'; \ + sha256='af607a5add4d6d0600bece0c6b50ce7fece516e449b17ded33be3445902edce9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 9b9e71348..fbba6bf2c 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5e0ae2df1651c6bed38c5367d0d84d5169537ef5426b2ee32f34e4166233efa7 +ENV DOCKER_COMPOSE_VERSION 2.39.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 7325ed60d..c2a0bc776 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5e0ae2df1651c6bed38c5367d0d84d5169537ef5426b2ee32f34e4166233efa7 +ENV DOCKER_COMPOSE_VERSION 2.39.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 01d80a53d..f3af5e597 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "a5ea28722d5da628b59226626f7d6c33c89a7ed19e39f750645925242044c9d2", - "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-x86_64" + "sha256": "a55a8cd4ef103aac282812554e531aac8df7e914a287ee81e14d695556a22902", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "14a8a2fd5ca75cf87a9c33f79eea5b51701d3a2039387ae48440c9d78b2c83c2", - "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-armv6" + "sha256": "a9fefb9f377d11416db7d653fac3c0ed8c61a0ef99c8e17369114b88ac48ab50", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "a97c785b148cf744e4f91835fa981dc93d6ced5132d42dab934947e33032af98", - "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-armv7" + "sha256": "9d1376146e42bf964f9efa8444935bc20accdc1d72a6ea44881b8d86c9ccfda9", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "7b2627ed76f7dcb0d93f649f185af912372229b4c09762a3cd1db5be5255632b", - "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-aarch64" + "sha256": "54488fffb60782f3c8787a48b95ed15f49f5a3a85f4105304bd46db5edd9db61", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "d8e3831e95285e9b7995be68b6efa2546a2eb4b8138abbdb7abd64c8986f5f0f", - "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-darwin-x86_64" + "sha256": "fb72c16602af3fe9331e198b7f0534fd194b157a68eb6c293641c1ebbe7eac8b", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "09fa8ee53514b11573f810eb64f78199fd11c66b29c54bf6be3b59563ca75740", - "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-darwin-aarch64" + "sha256": "44ea135a29b176d959aed927d61d3483b3f0e7b4a2025ab7812aa00086916f13", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "a2c76f4ea8cbba5906cfe9e97fc67463ad954813dfbddf341bf5062c5c0c93ec", - "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-ppc64le" + "sha256": "83a02be63cb047207a6efbd39af13d05b8d38065617764dddc3f6e5d36161d03", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "3e54325b4019398e058be3cd8589b9ecc98a1a97b7fe8f3280ee4e25281091e2", - "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-riscv64" + "sha256": "911f9a00366a619e15bb56fe37f6a09eddc30dc1d9f704309185fd2eec0fb3f9", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "87e75c7ffd019507c823c49d83fac62eda239e55544bb56d7707c817f52acc69", - "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-linux-s390x" + "sha256": "af607a5add4d6d0600bece0c6b50ce7fece516e449b17ded33be3445902edce9", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "5e0ae2df1651c6bed38c5367d0d84d5169537ef5426b2ee32f34e4166233efa7", - "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-windows-x86_64.exe" + "sha256": "6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "199de3889471da98b3f67297f4a7e244177315f5603308abf5f25ad6502ccacb", - "url": "https://github.com/docker/compose/releases/download/v2.39.1/docker-compose-windows-aarch64.exe" + "sha256": "3b39a6afe1fa54b89dfefad9e7607318f7c7d221fc24ccb93e96b2953f94af27", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.39.1" + "version": "2.39.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From bce646b7ffd6d126d920a3e06dd59d9192be8d9c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 20 Aug 2025 04:04:13 -0700 Subject: [PATCH 517/667] Update 28 to buildx 0.27.0 --- 28/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 9ddfa2d16..c89982857 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.26.1 +ENV DOCKER_BUILDX_VERSION 0.27.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-amd64'; \ - sha256='9451034b6ca5354e8bf88a2002a413aedabf110fd0f12ebb0b2f2cc241be8e41'; \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-amd64'; \ + sha256='4f5e5a1b6dd0d6ff8476c8def7602d1eeedcb6f602e8dcd45079d352247eba06'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm-v6'; \ - sha256='e9f89ed92231e937b380afc8f0105dc57e1fd5a3949a1545e863312706bf2947'; \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v6'; \ + sha256='216ef84b075c270ab2f0bbcf9fcedfb0175226349714a129b7806b4b3f1a460c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm-v7'; \ - sha256='92fe156e22eabbb58fb6b44aa3c59c2c06a820b66913158ed209ef5e18abc356'; \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v7'; \ + sha256='b7184384910ed1b3726f7dc340e3c644640fc5f7028c6ccdfda843cfbcb3fb67'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm64'; \ - sha256='b610d3c24836b2e7fecab5ef2c9466239a0f0156993a0406ea58943b87bff918'; \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm64'; \ + sha256='e3519d085710d2502c673380f763596ae0b378d0ae8976ccbb14adaed82327ef'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-ppc64le'; \ - sha256='74a9c8856ef7e742b5193358b43c8dbea9dc739009e4894c840fdb0a9c746d0d'; \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-ppc64le'; \ + sha256='e2bc5c418f680fa7ddb8782eea00a56725189ef672019db62b9f526d120afb08'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-riscv64'; \ - sha256='698496a08f9c008230e858c63590aeb44b4806df2d6f02cd0b382137ce9394c6'; \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-riscv64'; \ + sha256='e4f3b40472e3784bf5254eb399aa640205f349ee7c4839db989313d91258b7c6'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-s390x'; \ - sha256='6b561cb99d105114484897a3bc3f105dead11d4c14f28ffbf0873ce7fd1fe2d6'; \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-s390x'; \ + sha256='75c24bc03e809ead2e80840280359e3327965c6c1535d0fdc8d48cc86355eecb'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index fbba6bf2c..6ada04c97 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.26.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 7920bc77bdcad5d6bfb02e530ed67b8dfa550b77ae79e080ac4ee9424a75acea +ENV DOCKER_BUILDX_VERSION 0.27.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index c2a0bc776..b11ba6a7c 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.26.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 7920bc77bdcad5d6bfb02e530ed67b8dfa550b77ae79e080ac4ee9424a75acea +ENV DOCKER_BUILDX_VERSION 0.27.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f3af5e597..7b5f10dec 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.26.1.linux-amd64", - "sha256": "9451034b6ca5354e8bf88a2002a413aedabf110fd0f12ebb0b2f2cc241be8e41", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-amd64" + "file": "buildx-v0.27.0.linux-amd64", + "sha256": "4f5e5a1b6dd0d6ff8476c8def7602d1eeedcb6f602e8dcd45079d352247eba06", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.26.1.linux-arm-v6", - "sha256": "e9f89ed92231e937b380afc8f0105dc57e1fd5a3949a1545e863312706bf2947", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm-v6" + "file": "buildx-v0.27.0.linux-arm-v6", + "sha256": "216ef84b075c270ab2f0bbcf9fcedfb0175226349714a129b7806b4b3f1a460c", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.26.1.linux-arm-v7", - "sha256": "92fe156e22eabbb58fb6b44aa3c59c2c06a820b66913158ed209ef5e18abc356", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm-v7" + "file": "buildx-v0.27.0.linux-arm-v7", + "sha256": "b7184384910ed1b3726f7dc340e3c644640fc5f7028c6ccdfda843cfbcb3fb67", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.26.1.linux-arm64", - "sha256": "b610d3c24836b2e7fecab5ef2c9466239a0f0156993a0406ea58943b87bff918", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-arm64" + "file": "buildx-v0.27.0.linux-arm64", + "sha256": "e3519d085710d2502c673380f763596ae0b378d0ae8976ccbb14adaed82327ef", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.26.1.freebsd-amd64", - "sha256": "845637ec2e6d2207ec0b6a2879ebef268140acd78aac6487665af724a443877b", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.freebsd-amd64" + "file": "buildx-v0.27.0.freebsd-amd64", + "sha256": "cd31f9b6ef163e3cc7254d5e236d636ecfb5a6f91bb3801da5bb87680fec0408", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.26.1.freebsd-arm64", - "sha256": "56bcd03d4334ac4f81e45bda52fa4ba4c5e6ae5759385f2e6264920d53c5d185", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.freebsd-arm64" + "file": "buildx-v0.27.0.freebsd-arm64", + "sha256": "3e86ebde37d62ad015e7bf4dc2df1dc01c70ed2d8823d29ba0534f236c46a7c9", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.26.1.netbsd-amd64", - "sha256": "4ba1e369fe2ed8e333c8f002d63cdefcc76404519b9f98c177dd754c3a42b7df", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.netbsd-amd64" + "file": "buildx-v0.27.0.netbsd-amd64", + "sha256": "52a5854230decc620086a6223b12219997cb3802d5e373021a12ffb4ce2fe7be", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.26.1.netbsd-arm64", - "sha256": "c759ac9e66337d32822e8358e9f0631e9f5a7cedb000ca1951f5934e404aea8a", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.netbsd-arm64" + "file": "buildx-v0.27.0.netbsd-arm64", + "sha256": "4b55202f297f935f2fcefdd23ed6fa7af4c02681e80b6b2613dc4cdc18f8a709", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.26.1.openbsd-amd64", - "sha256": "f86f20ff2dec745631ad71d1f231b16c4ea69538ec7df1c01b89f216d3d42dd0", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.openbsd-amd64" + "file": "buildx-v0.27.0.openbsd-amd64", + "sha256": "e10f0738af187065e8e5d756715f01bb855721221b26ca806f500df1f452176d", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.26.1.openbsd-arm64", - "sha256": "0d34a2be144639a1f8fefa818c44abfbdaf83b3dc67fc1e0380c3dc93ba4f5a9", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.openbsd-arm64" + "file": "buildx-v0.27.0.openbsd-arm64", + "sha256": "4785f18ce53c580ef1002261fabcd7b54662c7061211c414578d9518495c24bf", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.26.1.linux-ppc64le", - "sha256": "74a9c8856ef7e742b5193358b43c8dbea9dc739009e4894c840fdb0a9c746d0d", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-ppc64le" + "file": "buildx-v0.27.0.linux-ppc64le", + "sha256": "e2bc5c418f680fa7ddb8782eea00a56725189ef672019db62b9f526d120afb08", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.26.1.linux-riscv64", - "sha256": "698496a08f9c008230e858c63590aeb44b4806df2d6f02cd0b382137ce9394c6", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-riscv64" + "file": "buildx-v0.27.0.linux-riscv64", + "sha256": "e4f3b40472e3784bf5254eb399aa640205f349ee7c4839db989313d91258b7c6", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.26.1.linux-s390x", - "sha256": "6b561cb99d105114484897a3bc3f105dead11d4c14f28ffbf0873ce7fd1fe2d6", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.linux-s390x" + "file": "buildx-v0.27.0.linux-s390x", + "sha256": "75c24bc03e809ead2e80840280359e3327965c6c1535d0fdc8d48cc86355eecb", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.26.1.windows-amd64.exe", - "sha256": "7920bc77bdcad5d6bfb02e530ed67b8dfa550b77ae79e080ac4ee9424a75acea", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.windows-amd64.exe" + "file": "buildx-v0.27.0.windows-amd64.exe", + "sha256": "1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.26.1.windows-arm64.exe", - "sha256": "caef69c5a6f12ed819a9e6e4d7ed948f89dc0bdeb9035534c280e93faddb920a", - "url": "https://github.com/docker/buildx/releases/download/v0.26.1/buildx-v0.26.1.windows-arm64.exe" + "file": "buildx-v0.27.0.windows-arm64.exe", + "sha256": "a8daac42e59fafe054aa4da57168775ca3f6548f33e00162c57a323d8500c9fb", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-arm64.exe" } }, - "version": "0.26.1" + "version": "0.27.0" }, "compose": { "arches": { From 4b77502f6afedb9868ed55d0d1db2a75bcf934a8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 1 Sep 2025 04:04:21 -0700 Subject: [PATCH 518/667] Update 28-rc to 28.4.0-rc.1, buildx 0.27.0, compose 2.39.2 --- 28-rc/cli/Dockerfile | 167 ++++++++++++ 28-rc/cli/docker-entrypoint.sh | 61 +++++ 28-rc/cli/modprobe.sh | 20 ++ 28-rc/dind-rootless/Dockerfile | 55 ++++ 28-rc/dind/Dockerfile | 108 ++++++++ 28-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 171 ++++++++++++- 9 files changed, 1001 insertions(+), 1 deletion(-) create mode 100644 28-rc/cli/Dockerfile create mode 100755 28-rc/cli/docker-entrypoint.sh create mode 100755 28-rc/cli/modprobe.sh create mode 100644 28-rc/dind-rootless/Dockerfile create mode 100644 28-rc/dind/Dockerfile create mode 100755 28-rc/dind/dockerd-entrypoint.sh create mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile new file mode 100644 index 000000000..2bf32efaf --- /dev/null +++ b/28-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.22 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 28.4.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.27.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-amd64'; \ + sha256='4f5e5a1b6dd0d6ff8476c8def7602d1eeedcb6f602e8dcd45079d352247eba06'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v6'; \ + sha256='216ef84b075c270ab2f0bbcf9fcedfb0175226349714a129b7806b4b3f1a460c'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v7'; \ + sha256='b7184384910ed1b3726f7dc340e3c644640fc5f7028c6ccdfda843cfbcb3fb67'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm64'; \ + sha256='e3519d085710d2502c673380f763596ae0b378d0ae8976ccbb14adaed82327ef'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-ppc64le'; \ + sha256='e2bc5c418f680fa7ddb8782eea00a56725189ef672019db62b9f526d120afb08'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-riscv64'; \ + sha256='e4f3b40472e3784bf5254eb399aa640205f349ee7c4839db989313d91258b7c6'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-s390x'; \ + sha256='75c24bc03e809ead2e80840280359e3327965c6c1535d0fdc8d48cc86355eecb'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.39.2 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-x86_64'; \ + sha256='a55a8cd4ef103aac282812554e531aac8df7e914a287ee81e14d695556a22902'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv6'; \ + sha256='a9fefb9f377d11416db7d653fac3c0ed8c61a0ef99c8e17369114b88ac48ab50'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv7'; \ + sha256='9d1376146e42bf964f9efa8444935bc20accdc1d72a6ea44881b8d86c9ccfda9'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-aarch64'; \ + sha256='54488fffb60782f3c8787a48b95ed15f49f5a3a85f4105304bd46db5edd9db61'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-ppc64le'; \ + sha256='83a02be63cb047207a6efbd39af13d05b8d38065617764dddc3f6e5d36161d03'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-riscv64'; \ + sha256='911f9a00366a619e15bb56fe37f6a09eddc30dc1d9f704309185fd2eec0fb3f9'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-s390x'; \ + sha256='af607a5add4d6d0600bece0c6b50ce7fece516e449b17ded33be3445902edce9'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/28-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/28-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..e1b321191 --- /dev/null +++ b/28-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-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 +# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.4.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.4.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile new file mode 100644 index 000000000..e4c49ad94 --- /dev/null +++ b/28-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..8a291dfa5 --- /dev/null +++ b/28-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..958e6cbb1 --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.4.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.27.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.39.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..1d73e36b9 --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.4.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.27.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.39.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 7b5f10dec..4dbf76924 100644 --- a/versions.json +++ b/versions.json @@ -169,5 +169,174 @@ ], "version": "28.3.3" }, - "28-rc": null + "28-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.4.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.4.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.27.0.linux-amd64", + "sha256": "4f5e5a1b6dd0d6ff8476c8def7602d1eeedcb6f602e8dcd45079d352247eba06", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.27.0.linux-arm-v6", + "sha256": "216ef84b075c270ab2f0bbcf9fcedfb0175226349714a129b7806b4b3f1a460c", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.27.0.linux-arm-v7", + "sha256": "b7184384910ed1b3726f7dc340e3c644640fc5f7028c6ccdfda843cfbcb3fb67", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.27.0.linux-arm64", + "sha256": "e3519d085710d2502c673380f763596ae0b378d0ae8976ccbb14adaed82327ef", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.27.0.freebsd-amd64", + "sha256": "cd31f9b6ef163e3cc7254d5e236d636ecfb5a6f91bb3801da5bb87680fec0408", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.27.0.freebsd-arm64", + "sha256": "3e86ebde37d62ad015e7bf4dc2df1dc01c70ed2d8823d29ba0534f236c46a7c9", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.27.0.netbsd-amd64", + "sha256": "52a5854230decc620086a6223b12219997cb3802d5e373021a12ffb4ce2fe7be", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.27.0.netbsd-arm64", + "sha256": "4b55202f297f935f2fcefdd23ed6fa7af4c02681e80b6b2613dc4cdc18f8a709", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.27.0.openbsd-amd64", + "sha256": "e10f0738af187065e8e5d756715f01bb855721221b26ca806f500df1f452176d", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.27.0.openbsd-arm64", + "sha256": "4785f18ce53c580ef1002261fabcd7b54662c7061211c414578d9518495c24bf", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.27.0.linux-ppc64le", + "sha256": "e2bc5c418f680fa7ddb8782eea00a56725189ef672019db62b9f526d120afb08", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.27.0.linux-riscv64", + "sha256": "e4f3b40472e3784bf5254eb399aa640205f349ee7c4839db989313d91258b7c6", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.27.0.linux-s390x", + "sha256": "75c24bc03e809ead2e80840280359e3327965c6c1535d0fdc8d48cc86355eecb", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.27.0.windows-amd64.exe", + "sha256": "1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.27.0.windows-arm64.exe", + "sha256": "a8daac42e59fafe054aa4da57168775ca3f6548f33e00162c57a323d8500c9fb", + "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-arm64.exe" + } + }, + "version": "0.27.0" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "a55a8cd4ef103aac282812554e531aac8df7e914a287ee81e14d695556a22902", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "a9fefb9f377d11416db7d653fac3c0ed8c61a0ef99c8e17369114b88ac48ab50", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "9d1376146e42bf964f9efa8444935bc20accdc1d72a6ea44881b8d86c9ccfda9", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "54488fffb60782f3c8787a48b95ed15f49f5a3a85f4105304bd46db5edd9db61", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "fb72c16602af3fe9331e198b7f0534fd194b157a68eb6c293641c1ebbe7eac8b", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "44ea135a29b176d959aed927d61d3483b3f0e7b4a2025ab7812aa00086916f13", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "83a02be63cb047207a6efbd39af13d05b8d38065617764dddc3f6e5d36161d03", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "911f9a00366a619e15bb56fe37f6a09eddc30dc1d9f704309185fd2eec0fb3f9", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "af607a5add4d6d0600bece0c6b50ce7fece516e449b17ded33be3445902edce9", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "3b39a6afe1fa54b89dfefad9e7607318f7c7d221fc24ccb93e96b2953f94af27", + "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.39.2" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "28.4.0-rc.1" + } } From 8dc1ba2d4332b949c82582e1c6cde1cdfab9fdbf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 2 Sep 2025 10:04:23 -0700 Subject: [PATCH 519/667] Update 28-rc to 28.4.0-rc.2 --- 28-rc/cli/Dockerfile | 10 +++++----- 28-rc/dind-rootless/Dockerfile | 4 ++-- 28-rc/dind/Dockerfile | 8 ++++---- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- .../windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index 2bf32efaf..fd08888e6 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.4.0-rc.1 +ENV DOCKER_VERSION 28.4.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile index e1b321191..5b93d86cb 100644 --- a/28-rc/dind-rootless/Dockerfile +++ b/28-rc/dind-rootless/Dockerfile @@ -25,10 +25,10 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.4.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.4.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile index e4c49ad94..5568da85a 100644 --- a/28-rc/dind/Dockerfile +++ b/28-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 958e6cbb1..5cfa999f9 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/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 28.4.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.1.zip +ENV DOCKER_VERSION 28.4.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.2.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/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index 1d73e36b9..a35583d72 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/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 28.4.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.1.zip +ENV DOCKER_VERSION 28.4.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.2.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/versions.json b/versions.json index 4dbf76924..01a6caf46 100644 --- a/versions.json +++ b/versions.json @@ -172,21 +172,21 @@ "28-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.4.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.4.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.4.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.4.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.2.zip" } }, "buildx": { @@ -337,6 +337,6 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "28.4.0-rc.1" + "version": "28.4.0-rc.2" } } From 1c159972e22aa2ebda6c851742be43e67778d13b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 3 Sep 2025 16:04:16 -0700 Subject: [PATCH 520/667] Update 28 to 28.4.0 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index c89982857..83094e4da 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.3.3 +ENV DOCKER_VERSION 28.4.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.4.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.3.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.4.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.4.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.4.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index 7fef8581d..674441cb4 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/dind-rootless/Dockerfile @@ -25,10 +25,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-28.3.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.4.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.4.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index a7124842d..ae255be2c 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.3.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.4.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.3.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.4.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.3.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.4.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.3.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.4.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 6ada04c97..656d028c6 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.3.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.3.zip +ENV DOCKER_VERSION 28.4.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.4.0.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index b11ba6a7c..03d6d7657 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.3.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.3.3.zip +ENV DOCKER_VERSION 28.4.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.4.0.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/versions.json b/versions.json index 01a6caf46..9ec6be1e1 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.3.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.3.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.4.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.4.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.3.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.4.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.3.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.4.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.3.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.3.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.4.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.4.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.3.3.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.4.0.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "28.3.3" + "version": "28.4.0" }, "28-rc": { "arches": { From 83efef1333c9c50c38af421176c71e3387bb6f63 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 3 Sep 2025 16:06:17 -0700 Subject: [PATCH 521/667] Update 28-rc --- 28-rc/cli/Dockerfile | 167 ------------ 28-rc/cli/docker-entrypoint.sh | 61 ----- 28-rc/cli/modprobe.sh | 20 -- 28-rc/dind-rootless/Dockerfile | 55 ---- 28-rc/dind/Dockerfile | 108 -------- 28-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 171 +------------ 9 files changed, 1 insertion(+), 1001 deletions(-) delete mode 100644 28-rc/cli/Dockerfile delete mode 100755 28-rc/cli/docker-entrypoint.sh delete mode 100755 28-rc/cli/modprobe.sh delete mode 100644 28-rc/dind-rootless/Dockerfile delete mode 100644 28-rc/dind/Dockerfile delete mode 100755 28-rc/dind/dockerd-entrypoint.sh delete mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile deleted file mode 100644 index fd08888e6..000000000 --- a/28-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.22 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 28.4.0-rc.2 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.27.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-amd64'; \ - sha256='4f5e5a1b6dd0d6ff8476c8def7602d1eeedcb6f602e8dcd45079d352247eba06'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v6'; \ - sha256='216ef84b075c270ab2f0bbcf9fcedfb0175226349714a129b7806b4b3f1a460c'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v7'; \ - sha256='b7184384910ed1b3726f7dc340e3c644640fc5f7028c6ccdfda843cfbcb3fb67'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm64'; \ - sha256='e3519d085710d2502c673380f763596ae0b378d0ae8976ccbb14adaed82327ef'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-ppc64le'; \ - sha256='e2bc5c418f680fa7ddb8782eea00a56725189ef672019db62b9f526d120afb08'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-riscv64'; \ - sha256='e4f3b40472e3784bf5254eb399aa640205f349ee7c4839db989313d91258b7c6'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-s390x'; \ - sha256='75c24bc03e809ead2e80840280359e3327965c6c1535d0fdc8d48cc86355eecb'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.39.2 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-x86_64'; \ - sha256='a55a8cd4ef103aac282812554e531aac8df7e914a287ee81e14d695556a22902'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv6'; \ - sha256='a9fefb9f377d11416db7d653fac3c0ed8c61a0ef99c8e17369114b88ac48ab50'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv7'; \ - sha256='9d1376146e42bf964f9efa8444935bc20accdc1d72a6ea44881b8d86c9ccfda9'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-aarch64'; \ - sha256='54488fffb60782f3c8787a48b95ed15f49f5a3a85f4105304bd46db5edd9db61'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-ppc64le'; \ - sha256='83a02be63cb047207a6efbd39af13d05b8d38065617764dddc3f6e5d36161d03'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-riscv64'; \ - sha256='911f9a00366a619e15bb56fe37f6a09eddc30dc1d9f704309185fd2eec0fb3f9'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-s390x'; \ - sha256='af607a5add4d6d0600bece0c6b50ce7fece516e449b17ded33be3445902edce9'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/28-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/28-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile deleted file mode 100644 index 5b93d86cb..000000000 --- a/28-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-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 -# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.4.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.4.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile deleted file mode 100644 index 5568da85a..000000000 --- a/28-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 8a291dfa5..000000000 --- a/28-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 5cfa999f9..000000000 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.4.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.27.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index a35583d72..000000000 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.4.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.27.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 9ec6be1e1..7f302e13e 100644 --- a/versions.json +++ b/versions.json @@ -169,174 +169,5 @@ ], "version": "28.4.0" }, - "28-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.4.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.4.0-rc.2.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.4.0-rc.2.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.4.0-rc.2.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.4.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.4.0-rc.2.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.4.0-rc.2.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.27.0.linux-amd64", - "sha256": "4f5e5a1b6dd0d6ff8476c8def7602d1eeedcb6f602e8dcd45079d352247eba06", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.27.0.linux-arm-v6", - "sha256": "216ef84b075c270ab2f0bbcf9fcedfb0175226349714a129b7806b4b3f1a460c", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.27.0.linux-arm-v7", - "sha256": "b7184384910ed1b3726f7dc340e3c644640fc5f7028c6ccdfda843cfbcb3fb67", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.27.0.linux-arm64", - "sha256": "e3519d085710d2502c673380f763596ae0b378d0ae8976ccbb14adaed82327ef", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.27.0.freebsd-amd64", - "sha256": "cd31f9b6ef163e3cc7254d5e236d636ecfb5a6f91bb3801da5bb87680fec0408", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.27.0.freebsd-arm64", - "sha256": "3e86ebde37d62ad015e7bf4dc2df1dc01c70ed2d8823d29ba0534f236c46a7c9", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.27.0.netbsd-amd64", - "sha256": "52a5854230decc620086a6223b12219997cb3802d5e373021a12ffb4ce2fe7be", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.27.0.netbsd-arm64", - "sha256": "4b55202f297f935f2fcefdd23ed6fa7af4c02681e80b6b2613dc4cdc18f8a709", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.27.0.openbsd-amd64", - "sha256": "e10f0738af187065e8e5d756715f01bb855721221b26ca806f500df1f452176d", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.27.0.openbsd-arm64", - "sha256": "4785f18ce53c580ef1002261fabcd7b54662c7061211c414578d9518495c24bf", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.27.0.linux-ppc64le", - "sha256": "e2bc5c418f680fa7ddb8782eea00a56725189ef672019db62b9f526d120afb08", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.27.0.linux-riscv64", - "sha256": "e4f3b40472e3784bf5254eb399aa640205f349ee7c4839db989313d91258b7c6", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.27.0.linux-s390x", - "sha256": "75c24bc03e809ead2e80840280359e3327965c6c1535d0fdc8d48cc86355eecb", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.27.0.windows-amd64.exe", - "sha256": "1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.27.0.windows-arm64.exe", - "sha256": "a8daac42e59fafe054aa4da57168775ca3f6548f33e00162c57a323d8500c9fb", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-arm64.exe" - } - }, - "version": "0.27.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "a55a8cd4ef103aac282812554e531aac8df7e914a287ee81e14d695556a22902", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "a9fefb9f377d11416db7d653fac3c0ed8c61a0ef99c8e17369114b88ac48ab50", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "9d1376146e42bf964f9efa8444935bc20accdc1d72a6ea44881b8d86c9ccfda9", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "54488fffb60782f3c8787a48b95ed15f49f5a3a85f4105304bd46db5edd9db61", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "fb72c16602af3fe9331e198b7f0534fd194b157a68eb6c293641c1ebbe7eac8b", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "44ea135a29b176d959aed927d61d3483b3f0e7b4a2025ab7812aa00086916f13", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "83a02be63cb047207a6efbd39af13d05b8d38065617764dddc3f6e5d36161d03", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "911f9a00366a619e15bb56fe37f6a09eddc30dc1d9f704309185fd2eec0fb3f9", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "af607a5add4d6d0600bece0c6b50ce7fece516e449b17ded33be3445902edce9", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "3b39a6afe1fa54b89dfefad9e7607318f7c7d221fc24ccb93e96b2953f94af27", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.39.2" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "28.4.0-rc.2" - } + "28-rc": null } From 14501013a18c57ec6961114d38753c5152c2cfc0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 3 Sep 2025 22:04:14 -0700 Subject: [PATCH 522/667] Update 28 to buildx 0.28.0 --- 28/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 83094e4da..4149bdf1d 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.27.0 +ENV DOCKER_BUILDX_VERSION 0.28.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-amd64'; \ - sha256='4f5e5a1b6dd0d6ff8476c8def7602d1eeedcb6f602e8dcd45079d352247eba06'; \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-amd64'; \ + sha256='696bc104bac3bb708eff1af3f8bbc09fda0fd88f5757c1f9b404a35117889224'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v6'; \ - sha256='216ef84b075c270ab2f0bbcf9fcedfb0175226349714a129b7806b4b3f1a460c'; \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v6'; \ + sha256='a61ebc09a4406b898d0ce73bc3aa7d70c5aef14b6fe46f18027e0f2ca3e9ae5c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v7'; \ - sha256='b7184384910ed1b3726f7dc340e3c644640fc5f7028c6ccdfda843cfbcb3fb67'; \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v7'; \ + sha256='b33d1b7ae5ce3cdae4b710bac1fae9fe101cb3862b00c8e2df424f0f2c2db285'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm64'; \ - sha256='e3519d085710d2502c673380f763596ae0b378d0ae8976ccbb14adaed82327ef'; \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm64'; \ + sha256='4e850583cc68ffd8d739ddb8a782b83f2ef9d3bf437ae7c44da4fbfde2613a8e'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-ppc64le'; \ - sha256='e2bc5c418f680fa7ddb8782eea00a56725189ef672019db62b9f526d120afb08'; \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-ppc64le'; \ + sha256='a62b15276f1956c34491f967d01cc07fa794a9fd93b7e67e066b07d018af9790'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-riscv64'; \ - sha256='e4f3b40472e3784bf5254eb399aa640205f349ee7c4839db989313d91258b7c6'; \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-riscv64'; \ + sha256='0136f808bab5f5e27da77236d45da5c8e62d4da019db057f495b1272a15263cf'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-s390x'; \ - sha256='75c24bc03e809ead2e80840280359e3327965c6c1535d0fdc8d48cc86355eecb'; \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-s390x'; \ + sha256='3057b70f926388e3beb88869d6d028d5893abf18a94496128ca440a80ce130ce'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 656d028c6..14621f868 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.27.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896 +ENV DOCKER_BUILDX_VERSION 0.28.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 03d6d7657..087b89e5b 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.27.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896 +ENV DOCKER_BUILDX_VERSION 0.28.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 7f302e13e..5f0528ac7 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.27.0.linux-amd64", - "sha256": "4f5e5a1b6dd0d6ff8476c8def7602d1eeedcb6f602e8dcd45079d352247eba06", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-amd64" + "file": "buildx-v0.28.0.linux-amd64", + "sha256": "696bc104bac3bb708eff1af3f8bbc09fda0fd88f5757c1f9b404a35117889224", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.27.0.linux-arm-v6", - "sha256": "216ef84b075c270ab2f0bbcf9fcedfb0175226349714a129b7806b4b3f1a460c", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v6" + "file": "buildx-v0.28.0.linux-arm-v6", + "sha256": "a61ebc09a4406b898d0ce73bc3aa7d70c5aef14b6fe46f18027e0f2ca3e9ae5c", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.27.0.linux-arm-v7", - "sha256": "b7184384910ed1b3726f7dc340e3c644640fc5f7028c6ccdfda843cfbcb3fb67", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm-v7" + "file": "buildx-v0.28.0.linux-arm-v7", + "sha256": "b33d1b7ae5ce3cdae4b710bac1fae9fe101cb3862b00c8e2df424f0f2c2db285", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.27.0.linux-arm64", - "sha256": "e3519d085710d2502c673380f763596ae0b378d0ae8976ccbb14adaed82327ef", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-arm64" + "file": "buildx-v0.28.0.linux-arm64", + "sha256": "4e850583cc68ffd8d739ddb8a782b83f2ef9d3bf437ae7c44da4fbfde2613a8e", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.27.0.freebsd-amd64", - "sha256": "cd31f9b6ef163e3cc7254d5e236d636ecfb5a6f91bb3801da5bb87680fec0408", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.freebsd-amd64" + "file": "buildx-v0.28.0.freebsd-amd64", + "sha256": "819e7fb994a67bf1e82937921546b9a40d3d05944df0156bbd10d756c45a460a", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.27.0.freebsd-arm64", - "sha256": "3e86ebde37d62ad015e7bf4dc2df1dc01c70ed2d8823d29ba0534f236c46a7c9", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.freebsd-arm64" + "file": "buildx-v0.28.0.freebsd-arm64", + "sha256": "a96eca7e2afe48c28228d78bd4be6cfba11e90513e414742be6f46189d293d53", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.27.0.netbsd-amd64", - "sha256": "52a5854230decc620086a6223b12219997cb3802d5e373021a12ffb4ce2fe7be", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.netbsd-amd64" + "file": "buildx-v0.28.0.netbsd-amd64", + "sha256": "4e5752599a52d406382286cddc648ef010400fac89049b79860408e0ead91fd5", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.27.0.netbsd-arm64", - "sha256": "4b55202f297f935f2fcefdd23ed6fa7af4c02681e80b6b2613dc4cdc18f8a709", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.netbsd-arm64" + "file": "buildx-v0.28.0.netbsd-arm64", + "sha256": "73025c04ed1a1c7e4f28d679682afc1c476fe84b517cd007d1d53ded47b8f14d", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.27.0.openbsd-amd64", - "sha256": "e10f0738af187065e8e5d756715f01bb855721221b26ca806f500df1f452176d", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.openbsd-amd64" + "file": "buildx-v0.28.0.openbsd-amd64", + "sha256": "634a04a692d9cdfda2165402a986ebc960dc72d1f9023ad3dca2aee12a434393", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.27.0.openbsd-arm64", - "sha256": "4785f18ce53c580ef1002261fabcd7b54662c7061211c414578d9518495c24bf", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.openbsd-arm64" + "file": "buildx-v0.28.0.openbsd-arm64", + "sha256": "d5f0387f7244b5abb91eb3dd6a0945cc67e2f19c434811af1cdd6970c9f19584", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.27.0.linux-ppc64le", - "sha256": "e2bc5c418f680fa7ddb8782eea00a56725189ef672019db62b9f526d120afb08", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-ppc64le" + "file": "buildx-v0.28.0.linux-ppc64le", + "sha256": "a62b15276f1956c34491f967d01cc07fa794a9fd93b7e67e066b07d018af9790", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.27.0.linux-riscv64", - "sha256": "e4f3b40472e3784bf5254eb399aa640205f349ee7c4839db989313d91258b7c6", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-riscv64" + "file": "buildx-v0.28.0.linux-riscv64", + "sha256": "0136f808bab5f5e27da77236d45da5c8e62d4da019db057f495b1272a15263cf", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.27.0.linux-s390x", - "sha256": "75c24bc03e809ead2e80840280359e3327965c6c1535d0fdc8d48cc86355eecb", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.linux-s390x" + "file": "buildx-v0.28.0.linux-s390x", + "sha256": "3057b70f926388e3beb88869d6d028d5893abf18a94496128ca440a80ce130ce", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.27.0.windows-amd64.exe", - "sha256": "1e89de288c9897990220d2ee695b50956d42a3a0792c0b070e9fee7711b9f896", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-amd64.exe" + "file": "buildx-v0.28.0.windows-amd64.exe", + "sha256": "0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.27.0.windows-arm64.exe", - "sha256": "a8daac42e59fafe054aa4da57168775ca3f6548f33e00162c57a323d8500c9fb", - "url": "https://github.com/docker/buildx/releases/download/v0.27.0/buildx-v0.27.0.windows-arm64.exe" + "file": "buildx-v0.28.0.windows-arm64.exe", + "sha256": "a110ebbf2379bcfbf72d533c283a133a44ffed14090279494ea74290291567d6", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-arm64.exe" } }, - "version": "0.27.0" + "version": "0.28.0" }, "compose": { "arches": { From 9ec9a719b2f803cb351c0db954f5653a4fd1d38c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 9 Sep 2025 04:04:40 -0700 Subject: [PATCH 523/667] Update 28 to compose 2.39.3 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 4149bdf1d..dffbd43d9 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.39.2 +ENV DOCKER_COMPOSE_VERSION 2.39.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-x86_64'; \ - sha256='a55a8cd4ef103aac282812554e531aac8df7e914a287ee81e14d695556a22902'; \ + url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-x86_64'; \ + sha256='065836e21bce25674d2876dc64321ac707808fcd120e1c3ba700b0ce5ce8ff16'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv6'; \ - sha256='a9fefb9f377d11416db7d653fac3c0ed8c61a0ef99c8e17369114b88ac48ab50'; \ + url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-armv6'; \ + sha256='49062d8d63320477c53bdf8c832eed29bc23f332bb36a01b149354f24a9ebd7d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv7'; \ - sha256='9d1376146e42bf964f9efa8444935bc20accdc1d72a6ea44881b8d86c9ccfda9'; \ + url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-armv7'; \ + sha256='e6dc34fb6d587a05f878901a27f9f0789dd471f655f130911b6d8fa8c332444e'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-aarch64'; \ - sha256='54488fffb60782f3c8787a48b95ed15f49f5a3a85f4105304bd46db5edd9db61'; \ + url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-aarch64'; \ + sha256='1607ff1b288ea5acd93d6a2c5a4f53ecd1e237e6e17e7babb0f540a24d667f33'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-ppc64le'; \ - sha256='83a02be63cb047207a6efbd39af13d05b8d38065617764dddc3f6e5d36161d03'; \ + url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-ppc64le'; \ + sha256='675eb2764cf13d533fbabf4ea3e47b944e0ad8ed89f71163997aaeee608e43b2'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-riscv64'; \ - sha256='911f9a00366a619e15bb56fe37f6a09eddc30dc1d9f704309185fd2eec0fb3f9'; \ + url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-riscv64'; \ + sha256='fca2309ed988bc9b4f3d0f9f7d3b07e636e751c979ddd81dd1cee69c4f7ae58b'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-s390x'; \ - sha256='af607a5add4d6d0600bece0c6b50ce7fece516e449b17ded33be3445902edce9'; \ + url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-s390x'; \ + sha256='882705b391b288531d937b13202b5bc76dfaff8bba2ee5f25c15ea7fda1a2d91'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 14621f868..844038b30 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158 +ENV DOCKER_COMPOSE_VERSION 2.39.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c6a724f026f4a65e7648fba6e1b27eb5abaa057e7dbf2beeacc760f9db723c01 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 087b89e5b..9fadf5d49 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158 +ENV DOCKER_COMPOSE_VERSION 2.39.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 c6a724f026f4a65e7648fba6e1b27eb5abaa057e7dbf2beeacc760f9db723c01 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 5f0528ac7..e0ac08a25 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "a55a8cd4ef103aac282812554e531aac8df7e914a287ee81e14d695556a22902", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-x86_64" + "sha256": "065836e21bce25674d2876dc64321ac707808fcd120e1c3ba700b0ce5ce8ff16", + "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a9fefb9f377d11416db7d653fac3c0ed8c61a0ef99c8e17369114b88ac48ab50", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv6" + "sha256": "49062d8d63320477c53bdf8c832eed29bc23f332bb36a01b149354f24a9ebd7d", + "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "9d1376146e42bf964f9efa8444935bc20accdc1d72a6ea44881b8d86c9ccfda9", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-armv7" + "sha256": "e6dc34fb6d587a05f878901a27f9f0789dd471f655f130911b6d8fa8c332444e", + "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "54488fffb60782f3c8787a48b95ed15f49f5a3a85f4105304bd46db5edd9db61", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-aarch64" + "sha256": "1607ff1b288ea5acd93d6a2c5a4f53ecd1e237e6e17e7babb0f540a24d667f33", + "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "fb72c16602af3fe9331e198b7f0534fd194b157a68eb6c293641c1ebbe7eac8b", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-darwin-x86_64" + "sha256": "feba1c33a20aa4ae0fcc5e0d7cffd57ebe2998aa27b5c45619404345f9ee9b99", + "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "44ea135a29b176d959aed927d61d3483b3f0e7b4a2025ab7812aa00086916f13", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-darwin-aarch64" + "sha256": "b3e20de59b25394e88ca9cf90be33c98e02d92fac86ca6a08d5832825be0c577", + "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "83a02be63cb047207a6efbd39af13d05b8d38065617764dddc3f6e5d36161d03", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-ppc64le" + "sha256": "675eb2764cf13d533fbabf4ea3e47b944e0ad8ed89f71163997aaeee608e43b2", + "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "911f9a00366a619e15bb56fe37f6a09eddc30dc1d9f704309185fd2eec0fb3f9", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-riscv64" + "sha256": "fca2309ed988bc9b4f3d0f9f7d3b07e636e751c979ddd81dd1cee69c4f7ae58b", + "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "af607a5add4d6d0600bece0c6b50ce7fece516e449b17ded33be3445902edce9", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-linux-s390x" + "sha256": "882705b391b288531d937b13202b5bc76dfaff8bba2ee5f25c15ea7fda1a2d91", + "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "6580793b1f612150646a9f8d02148c8d226a0033ed6e2e3273c0229b25e2f158", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-x86_64.exe" + "sha256": "c6a724f026f4a65e7648fba6e1b27eb5abaa057e7dbf2beeacc760f9db723c01", + "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "3b39a6afe1fa54b89dfefad9e7607318f7c7d221fc24ccb93e96b2953f94af27", - "url": "https://github.com/docker/compose/releases/download/v2.39.2/docker-compose-windows-aarch64.exe" + "sha256": "c2e119e9554872242b832a938c33055c9897e5c8d90c3fd63f690b138a27db57", + "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.39.2" + "version": "2.39.3" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From b2bffb1e479e614f1a65ffdf8e9120200b76d08b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 19 Sep 2025 04:04:16 -0700 Subject: [PATCH 524/667] Update 28 to compose 2.39.4 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index dffbd43d9..07257bbc4 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.39.3 +ENV DOCKER_COMPOSE_VERSION 2.39.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-x86_64'; \ - sha256='065836e21bce25674d2876dc64321ac707808fcd120e1c3ba700b0ce5ce8ff16'; \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-x86_64'; \ + sha256='7af95166a730b87e172d4fc9aefea8725d3c6c7327d59149267b452114ddb7d4'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-armv6'; \ - sha256='49062d8d63320477c53bdf8c832eed29bc23f332bb36a01b149354f24a9ebd7d'; \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv6'; \ + sha256='e376f677087bc5d85a19d24765fea400f88de2d18577dab0dd746961fcfe8804'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-armv7'; \ - sha256='e6dc34fb6d587a05f878901a27f9f0789dd471f655f130911b6d8fa8c332444e'; \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv7'; \ + sha256='c0d6fe1d2e1e3e8490804ef092793f3c0368c4458d0fcb86a7df8670a9d8ae78'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-aarch64'; \ - sha256='1607ff1b288ea5acd93d6a2c5a4f53ecd1e237e6e17e7babb0f540a24d667f33'; \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-aarch64'; \ + sha256='49082844b87f03cdcd5f5bbef1ba8c9c897b7a2dfb80cea18d61ec8ca6117e0c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-ppc64le'; \ - sha256='675eb2764cf13d533fbabf4ea3e47b944e0ad8ed89f71163997aaeee608e43b2'; \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-ppc64le'; \ + sha256='a731c350b577926b11b986d1e54e2332bdef3647c55c90931000ad9e8434d0cc'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-riscv64'; \ - sha256='fca2309ed988bc9b4f3d0f9f7d3b07e636e751c979ddd81dd1cee69c4f7ae58b'; \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-riscv64'; \ + sha256='a7081ade7067a5486a81514d50adec82337e14cdcea5f2127edd6e45905fc0fa'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-s390x'; \ - sha256='882705b391b288531d937b13202b5bc76dfaff8bba2ee5f25c15ea7fda1a2d91'; \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-s390x'; \ + sha256='4e32f5c43ffe7564d9a39f78d502fbdc17904e1b62add9c7939ec3bbd6de1af9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 844038b30..13b226f83 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c6a724f026f4a65e7648fba6e1b27eb5abaa057e7dbf2beeacc760f9db723c01 +ENV DOCKER_COMPOSE_VERSION 2.39.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 9fadf5d49..1b8213dc2 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 c6a724f026f4a65e7648fba6e1b27eb5abaa057e7dbf2beeacc760f9db723c01 +ENV DOCKER_COMPOSE_VERSION 2.39.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index e0ac08a25..53ea0ce31 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "065836e21bce25674d2876dc64321ac707808fcd120e1c3ba700b0ce5ce8ff16", - "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-x86_64" + "sha256": "7af95166a730b87e172d4fc9aefea8725d3c6c7327d59149267b452114ddb7d4", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "49062d8d63320477c53bdf8c832eed29bc23f332bb36a01b149354f24a9ebd7d", - "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-armv6" + "sha256": "e376f677087bc5d85a19d24765fea400f88de2d18577dab0dd746961fcfe8804", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "e6dc34fb6d587a05f878901a27f9f0789dd471f655f130911b6d8fa8c332444e", - "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-armv7" + "sha256": "c0d6fe1d2e1e3e8490804ef092793f3c0368c4458d0fcb86a7df8670a9d8ae78", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "1607ff1b288ea5acd93d6a2c5a4f53ecd1e237e6e17e7babb0f540a24d667f33", - "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-aarch64" + "sha256": "49082844b87f03cdcd5f5bbef1ba8c9c897b7a2dfb80cea18d61ec8ca6117e0c", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "feba1c33a20aa4ae0fcc5e0d7cffd57ebe2998aa27b5c45619404345f9ee9b99", - "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-darwin-x86_64" + "sha256": "ec56a48c47ff30db7626f980f36e48d9573114626c2beb6b76b47dd6ff4aa63c", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "b3e20de59b25394e88ca9cf90be33c98e02d92fac86ca6a08d5832825be0c577", - "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-darwin-aarch64" + "sha256": "718d09670f2017cdb7bfabccebdbf00b3f971a7e560afc13512b4334796e3cf0", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "675eb2764cf13d533fbabf4ea3e47b944e0ad8ed89f71163997aaeee608e43b2", - "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-ppc64le" + "sha256": "a731c350b577926b11b986d1e54e2332bdef3647c55c90931000ad9e8434d0cc", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "fca2309ed988bc9b4f3d0f9f7d3b07e636e751c979ddd81dd1cee69c4f7ae58b", - "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-riscv64" + "sha256": "a7081ade7067a5486a81514d50adec82337e14cdcea5f2127edd6e45905fc0fa", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "882705b391b288531d937b13202b5bc76dfaff8bba2ee5f25c15ea7fda1a2d91", - "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-linux-s390x" + "sha256": "4e32f5c43ffe7564d9a39f78d502fbdc17904e1b62add9c7939ec3bbd6de1af9", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "c6a724f026f4a65e7648fba6e1b27eb5abaa057e7dbf2beeacc760f9db723c01", - "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-windows-x86_64.exe" + "sha256": "6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "c2e119e9554872242b832a938c33055c9897e5c8d90c3fd63f690b138a27db57", - "url": "https://github.com/docker/compose/releases/download/v2.39.3/docker-compose-windows-aarch64.exe" + "sha256": "f33df1eb9206432658276bbf0597b66b45fc0f3075a1c49a38b10f5ceb3a3590", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-aarch64.exe" } }, - "version": "2.39.3" + "version": "2.39.4" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 393b1f9a22b5084cf1ea3aa897ecc45f15d6b200 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 25 Sep 2025 10:04:22 -0700 Subject: [PATCH 525/667] Update 28-rc to 28.5.0-rc.1, buildx 0.28.0, compose 2.39.4 --- 28-rc/cli/Dockerfile | 167 ++++++++++++ 28-rc/cli/docker-entrypoint.sh | 61 +++++ 28-rc/cli/modprobe.sh | 20 ++ 28-rc/dind-rootless/Dockerfile | 55 ++++ 28-rc/dind/Dockerfile | 108 ++++++++ 28-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 171 ++++++++++++- 9 files changed, 1001 insertions(+), 1 deletion(-) create mode 100644 28-rc/cli/Dockerfile create mode 100755 28-rc/cli/docker-entrypoint.sh create mode 100755 28-rc/cli/modprobe.sh create mode 100644 28-rc/dind-rootless/Dockerfile create mode 100644 28-rc/dind/Dockerfile create mode 100755 28-rc/dind/dockerd-entrypoint.sh create mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile new file mode 100644 index 000000000..d162744cb --- /dev/null +++ b/28-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.22 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 28.5.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.5.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.5.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.5.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.5.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.28.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-amd64'; \ + sha256='696bc104bac3bb708eff1af3f8bbc09fda0fd88f5757c1f9b404a35117889224'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v6'; \ + sha256='a61ebc09a4406b898d0ce73bc3aa7d70c5aef14b6fe46f18027e0f2ca3e9ae5c'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v7'; \ + sha256='b33d1b7ae5ce3cdae4b710bac1fae9fe101cb3862b00c8e2df424f0f2c2db285'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm64'; \ + sha256='4e850583cc68ffd8d739ddb8a782b83f2ef9d3bf437ae7c44da4fbfde2613a8e'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-ppc64le'; \ + sha256='a62b15276f1956c34491f967d01cc07fa794a9fd93b7e67e066b07d018af9790'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-riscv64'; \ + sha256='0136f808bab5f5e27da77236d45da5c8e62d4da019db057f495b1272a15263cf'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-s390x'; \ + sha256='3057b70f926388e3beb88869d6d028d5893abf18a94496128ca440a80ce130ce'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.39.4 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-x86_64'; \ + sha256='7af95166a730b87e172d4fc9aefea8725d3c6c7327d59149267b452114ddb7d4'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv6'; \ + sha256='e376f677087bc5d85a19d24765fea400f88de2d18577dab0dd746961fcfe8804'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv7'; \ + sha256='c0d6fe1d2e1e3e8490804ef092793f3c0368c4458d0fcb86a7df8670a9d8ae78'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-aarch64'; \ + sha256='49082844b87f03cdcd5f5bbef1ba8c9c897b7a2dfb80cea18d61ec8ca6117e0c'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-ppc64le'; \ + sha256='a731c350b577926b11b986d1e54e2332bdef3647c55c90931000ad9e8434d0cc'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-riscv64'; \ + sha256='a7081ade7067a5486a81514d50adec82337e14cdcea5f2127edd6e45905fc0fa'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-s390x'; \ + sha256='4e32f5c43ffe7564d9a39f78d502fbdc17904e1b62add9c7939ec3bbd6de1af9'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/28-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/28-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..2ac59e7db --- /dev/null +++ b/28-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-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 +# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.5.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.5.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile new file mode 100644 index 000000000..bd894e292 --- /dev/null +++ b/28-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:28-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-28.5.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-28.5.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-28.5.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-28.5.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..8a291dfa5 --- /dev/null +++ b/28-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..5d2c91e5e --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.5.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.5.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.28.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.39.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..e5e51a67a --- /dev/null +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 28.5.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.5.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.28.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.39.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 53ea0ce31..46f5646e5 100644 --- a/versions.json +++ b/versions.json @@ -169,5 +169,174 @@ ], "version": "28.4.0" }, - "28-rc": null + "28-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.5.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.5.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.5.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.5.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.5.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.5.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.5.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.28.0.linux-amd64", + "sha256": "696bc104bac3bb708eff1af3f8bbc09fda0fd88f5757c1f9b404a35117889224", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.28.0.linux-arm-v6", + "sha256": "a61ebc09a4406b898d0ce73bc3aa7d70c5aef14b6fe46f18027e0f2ca3e9ae5c", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.28.0.linux-arm-v7", + "sha256": "b33d1b7ae5ce3cdae4b710bac1fae9fe101cb3862b00c8e2df424f0f2c2db285", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.28.0.linux-arm64", + "sha256": "4e850583cc68ffd8d739ddb8a782b83f2ef9d3bf437ae7c44da4fbfde2613a8e", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.28.0.freebsd-amd64", + "sha256": "819e7fb994a67bf1e82937921546b9a40d3d05944df0156bbd10d756c45a460a", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.28.0.freebsd-arm64", + "sha256": "a96eca7e2afe48c28228d78bd4be6cfba11e90513e414742be6f46189d293d53", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.28.0.netbsd-amd64", + "sha256": "4e5752599a52d406382286cddc648ef010400fac89049b79860408e0ead91fd5", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.28.0.netbsd-arm64", + "sha256": "73025c04ed1a1c7e4f28d679682afc1c476fe84b517cd007d1d53ded47b8f14d", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.28.0.openbsd-amd64", + "sha256": "634a04a692d9cdfda2165402a986ebc960dc72d1f9023ad3dca2aee12a434393", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.28.0.openbsd-arm64", + "sha256": "d5f0387f7244b5abb91eb3dd6a0945cc67e2f19c434811af1cdd6970c9f19584", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.28.0.linux-ppc64le", + "sha256": "a62b15276f1956c34491f967d01cc07fa794a9fd93b7e67e066b07d018af9790", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.28.0.linux-riscv64", + "sha256": "0136f808bab5f5e27da77236d45da5c8e62d4da019db057f495b1272a15263cf", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.28.0.linux-s390x", + "sha256": "3057b70f926388e3beb88869d6d028d5893abf18a94496128ca440a80ce130ce", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.28.0.windows-amd64.exe", + "sha256": "0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.28.0.windows-arm64.exe", + "sha256": "a110ebbf2379bcfbf72d533c283a133a44ffed14090279494ea74290291567d6", + "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-arm64.exe" + } + }, + "version": "0.28.0" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "7af95166a730b87e172d4fc9aefea8725d3c6c7327d59149267b452114ddb7d4", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "e376f677087bc5d85a19d24765fea400f88de2d18577dab0dd746961fcfe8804", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "c0d6fe1d2e1e3e8490804ef092793f3c0368c4458d0fcb86a7df8670a9d8ae78", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "49082844b87f03cdcd5f5bbef1ba8c9c897b7a2dfb80cea18d61ec8ca6117e0c", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "ec56a48c47ff30db7626f980f36e48d9573114626c2beb6b76b47dd6ff4aa63c", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "718d09670f2017cdb7bfabccebdbf00b3f971a7e560afc13512b4334796e3cf0", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "a731c350b577926b11b986d1e54e2332bdef3647c55c90931000ad9e8434d0cc", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "a7081ade7067a5486a81514d50adec82337e14cdcea5f2127edd6e45905fc0fa", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "4e32f5c43ffe7564d9a39f78d502fbdc17904e1b62add9c7939ec3bbd6de1af9", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "f33df1eb9206432658276bbf0597b66b45fc0f3075a1c49a38b10f5ceb3a3590", + "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.39.4" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "28.5.0-rc.1" + } } From 9a7d9916a803ee19c3224daafa12d3de498a801e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 30 Sep 2025 16:04:27 -0700 Subject: [PATCH 526/667] Update 28 to buildx 0.29.0 --- 28/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 07257bbc4..dd0398b9a 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.28.0 +ENV DOCKER_BUILDX_VERSION 0.29.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-amd64'; \ - sha256='696bc104bac3bb708eff1af3f8bbc09fda0fd88f5757c1f9b404a35117889224'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-amd64'; \ + sha256='d02d47061bede1b90d34bf6562a5f39e686773e97cf9d00e7114b3c1e269e524'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v6'; \ - sha256='a61ebc09a4406b898d0ce73bc3aa7d70c5aef14b6fe46f18027e0f2ca3e9ae5c'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v6'; \ + sha256='7a90b222d33f2b70540ac9fa0d2d7feff02accb83a22c557c78f2ad924807ed5'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v7'; \ - sha256='b33d1b7ae5ce3cdae4b710bac1fae9fe101cb3862b00c8e2df424f0f2c2db285'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v7'; \ + sha256='4af7949022b2f5228990d7b9faab5cea8ac93edc6faf284d115fa33bbb367778'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm64'; \ - sha256='4e850583cc68ffd8d739ddb8a782b83f2ef9d3bf437ae7c44da4fbfde2613a8e'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm64'; \ + sha256='14e50940aef67c4b46f6b03a5ccc3851a30f883e751a61048a4bc80b8832a840'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-ppc64le'; \ - sha256='a62b15276f1956c34491f967d01cc07fa794a9fd93b7e67e066b07d018af9790'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-ppc64le'; \ + sha256='eaaa77de28c79306be25ad992a1fbd537113bc3543ccac2a3e2e1855a752a665'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-riscv64'; \ - sha256='0136f808bab5f5e27da77236d45da5c8e62d4da019db057f495b1272a15263cf'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-riscv64'; \ + sha256='16fcd25ec8ca6f15d6264133c3dc93cdce211fb2028b8cb529c0ea7b880c3818'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-s390x'; \ - sha256='3057b70f926388e3beb88869d6d028d5893abf18a94496128ca440a80ce130ce'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-s390x'; \ + sha256='dec5db787903debb0f83012a416421e4119d7f28837ae7aa6ae5b689750285fe'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 13b226f83..22a4712fa 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.28.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee +ENV DOCKER_BUILDX_VERSION 0.29.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 1b8213dc2..866ac5b71 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.28.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee +ENV DOCKER_BUILDX_VERSION 0.29.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 46f5646e5..d444e75a8 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.28.0.linux-amd64", - "sha256": "696bc104bac3bb708eff1af3f8bbc09fda0fd88f5757c1f9b404a35117889224", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-amd64" + "file": "buildx-v0.29.0.linux-amd64", + "sha256": "d02d47061bede1b90d34bf6562a5f39e686773e97cf9d00e7114b3c1e269e524", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.28.0.linux-arm-v6", - "sha256": "a61ebc09a4406b898d0ce73bc3aa7d70c5aef14b6fe46f18027e0f2ca3e9ae5c", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v6" + "file": "buildx-v0.29.0.linux-arm-v6", + "sha256": "7a90b222d33f2b70540ac9fa0d2d7feff02accb83a22c557c78f2ad924807ed5", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.28.0.linux-arm-v7", - "sha256": "b33d1b7ae5ce3cdae4b710bac1fae9fe101cb3862b00c8e2df424f0f2c2db285", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v7" + "file": "buildx-v0.29.0.linux-arm-v7", + "sha256": "4af7949022b2f5228990d7b9faab5cea8ac93edc6faf284d115fa33bbb367778", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.28.0.linux-arm64", - "sha256": "4e850583cc68ffd8d739ddb8a782b83f2ef9d3bf437ae7c44da4fbfde2613a8e", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm64" + "file": "buildx-v0.29.0.linux-arm64", + "sha256": "14e50940aef67c4b46f6b03a5ccc3851a30f883e751a61048a4bc80b8832a840", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.28.0.freebsd-amd64", - "sha256": "819e7fb994a67bf1e82937921546b9a40d3d05944df0156bbd10d756c45a460a", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.freebsd-amd64" + "file": "buildx-v0.29.0.freebsd-amd64", + "sha256": "b6665e366f30b51162f3b145e01377659ae65f90b8dfad7cbb2ba01c40ce34ae", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.28.0.freebsd-arm64", - "sha256": "a96eca7e2afe48c28228d78bd4be6cfba11e90513e414742be6f46189d293d53", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.freebsd-arm64" + "file": "buildx-v0.29.0.freebsd-arm64", + "sha256": "70d9482cffadb3c7a0e18ce3ac9d4ee1ff60bcfb99796e479df97a5dfe21eb30", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.28.0.netbsd-amd64", - "sha256": "4e5752599a52d406382286cddc648ef010400fac89049b79860408e0ead91fd5", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.netbsd-amd64" + "file": "buildx-v0.29.0.netbsd-amd64", + "sha256": "b05b87621ede76447a3c5ad573aff393c3162dbf99ccc9bf0f01109537a1f7b9", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.28.0.netbsd-arm64", - "sha256": "73025c04ed1a1c7e4f28d679682afc1c476fe84b517cd007d1d53ded47b8f14d", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.netbsd-arm64" + "file": "buildx-v0.29.0.netbsd-arm64", + "sha256": "acf2c7f7be96ada4d21077e343fc611938f81a603da01c26295b86e810f1f2c4", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.28.0.openbsd-amd64", - "sha256": "634a04a692d9cdfda2165402a986ebc960dc72d1f9023ad3dca2aee12a434393", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.openbsd-amd64" + "file": "buildx-v0.29.0.openbsd-amd64", + "sha256": "f6e31c1185bc96298334cac9820a8887966882b41c28b726a68a36cdbbcc4598", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.28.0.openbsd-arm64", - "sha256": "d5f0387f7244b5abb91eb3dd6a0945cc67e2f19c434811af1cdd6970c9f19584", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.openbsd-arm64" + "file": "buildx-v0.29.0.openbsd-arm64", + "sha256": "b39797ac1647494166dc05f6241ddfc40f512031e66cde4c2bedaf78ee1feab7", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.28.0.linux-ppc64le", - "sha256": "a62b15276f1956c34491f967d01cc07fa794a9fd93b7e67e066b07d018af9790", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-ppc64le" + "file": "buildx-v0.29.0.linux-ppc64le", + "sha256": "eaaa77de28c79306be25ad992a1fbd537113bc3543ccac2a3e2e1855a752a665", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.28.0.linux-riscv64", - "sha256": "0136f808bab5f5e27da77236d45da5c8e62d4da019db057f495b1272a15263cf", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-riscv64" + "file": "buildx-v0.29.0.linux-riscv64", + "sha256": "16fcd25ec8ca6f15d6264133c3dc93cdce211fb2028b8cb529c0ea7b880c3818", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.28.0.linux-s390x", - "sha256": "3057b70f926388e3beb88869d6d028d5893abf18a94496128ca440a80ce130ce", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-s390x" + "file": "buildx-v0.29.0.linux-s390x", + "sha256": "dec5db787903debb0f83012a416421e4119d7f28837ae7aa6ae5b689750285fe", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.28.0.windows-amd64.exe", - "sha256": "0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe" + "file": "buildx-v0.29.0.windows-amd64.exe", + "sha256": "d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.28.0.windows-arm64.exe", - "sha256": "a110ebbf2379bcfbf72d533c283a133a44ffed14090279494ea74290291567d6", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-arm64.exe" + "file": "buildx-v0.29.0.windows-arm64.exe", + "sha256": "eb71e15ea22eea5152d1d72a999224baa4f65f4d2ee5845ea0c4fa1119dfc3ed", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-arm64.exe" } }, - "version": "0.28.0" + "version": "0.29.0" }, "compose": { "arches": { From ef9b95038339a4c6d89a6e58317c0115ead716c5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 30 Sep 2025 16:06:27 -0700 Subject: [PATCH 527/667] Update 28-rc to buildx 0.29.0 --- 28-rc/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile index d162744cb..842028df3 100644 --- a/28-rc/cli/Dockerfile +++ b/28-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.28.0 +ENV DOCKER_BUILDX_VERSION 0.29.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-amd64'; \ - sha256='696bc104bac3bb708eff1af3f8bbc09fda0fd88f5757c1f9b404a35117889224'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-amd64'; \ + sha256='d02d47061bede1b90d34bf6562a5f39e686773e97cf9d00e7114b3c1e269e524'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v6'; \ - sha256='a61ebc09a4406b898d0ce73bc3aa7d70c5aef14b6fe46f18027e0f2ca3e9ae5c'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v6'; \ + sha256='7a90b222d33f2b70540ac9fa0d2d7feff02accb83a22c557c78f2ad924807ed5'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v7'; \ - sha256='b33d1b7ae5ce3cdae4b710bac1fae9fe101cb3862b00c8e2df424f0f2c2db285'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v7'; \ + sha256='4af7949022b2f5228990d7b9faab5cea8ac93edc6faf284d115fa33bbb367778'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm64'; \ - sha256='4e850583cc68ffd8d739ddb8a782b83f2ef9d3bf437ae7c44da4fbfde2613a8e'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm64'; \ + sha256='14e50940aef67c4b46f6b03a5ccc3851a30f883e751a61048a4bc80b8832a840'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-ppc64le'; \ - sha256='a62b15276f1956c34491f967d01cc07fa794a9fd93b7e67e066b07d018af9790'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-ppc64le'; \ + sha256='eaaa77de28c79306be25ad992a1fbd537113bc3543ccac2a3e2e1855a752a665'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-riscv64'; \ - sha256='0136f808bab5f5e27da77236d45da5c8e62d4da019db057f495b1272a15263cf'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-riscv64'; \ + sha256='16fcd25ec8ca6f15d6264133c3dc93cdce211fb2028b8cb529c0ea7b880c3818'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-s390x'; \ - sha256='3057b70f926388e3beb88869d6d028d5893abf18a94496128ca440a80ce130ce'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-s390x'; \ + sha256='dec5db787903debb0f83012a416421e4119d7f28837ae7aa6ae5b689750285fe'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile index 5d2c91e5e..ca294b76b 100644 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.28.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee +ENV DOCKER_BUILDX_VERSION 0.29.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile index e5e51a67a..4c0e49cda 100644 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.28.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee +ENV DOCKER_BUILDX_VERSION 0.29.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index d444e75a8..7fbc15379 100644 --- a/versions.json +++ b/versions.json @@ -192,82 +192,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.28.0.linux-amd64", - "sha256": "696bc104bac3bb708eff1af3f8bbc09fda0fd88f5757c1f9b404a35117889224", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-amd64" + "file": "buildx-v0.29.0.linux-amd64", + "sha256": "d02d47061bede1b90d34bf6562a5f39e686773e97cf9d00e7114b3c1e269e524", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.28.0.linux-arm-v6", - "sha256": "a61ebc09a4406b898d0ce73bc3aa7d70c5aef14b6fe46f18027e0f2ca3e9ae5c", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v6" + "file": "buildx-v0.29.0.linux-arm-v6", + "sha256": "7a90b222d33f2b70540ac9fa0d2d7feff02accb83a22c557c78f2ad924807ed5", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.28.0.linux-arm-v7", - "sha256": "b33d1b7ae5ce3cdae4b710bac1fae9fe101cb3862b00c8e2df424f0f2c2db285", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm-v7" + "file": "buildx-v0.29.0.linux-arm-v7", + "sha256": "4af7949022b2f5228990d7b9faab5cea8ac93edc6faf284d115fa33bbb367778", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.28.0.linux-arm64", - "sha256": "4e850583cc68ffd8d739ddb8a782b83f2ef9d3bf437ae7c44da4fbfde2613a8e", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-arm64" + "file": "buildx-v0.29.0.linux-arm64", + "sha256": "14e50940aef67c4b46f6b03a5ccc3851a30f883e751a61048a4bc80b8832a840", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.28.0.freebsd-amd64", - "sha256": "819e7fb994a67bf1e82937921546b9a40d3d05944df0156bbd10d756c45a460a", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.freebsd-amd64" + "file": "buildx-v0.29.0.freebsd-amd64", + "sha256": "b6665e366f30b51162f3b145e01377659ae65f90b8dfad7cbb2ba01c40ce34ae", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.28.0.freebsd-arm64", - "sha256": "a96eca7e2afe48c28228d78bd4be6cfba11e90513e414742be6f46189d293d53", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.freebsd-arm64" + "file": "buildx-v0.29.0.freebsd-arm64", + "sha256": "70d9482cffadb3c7a0e18ce3ac9d4ee1ff60bcfb99796e479df97a5dfe21eb30", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.28.0.netbsd-amd64", - "sha256": "4e5752599a52d406382286cddc648ef010400fac89049b79860408e0ead91fd5", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.netbsd-amd64" + "file": "buildx-v0.29.0.netbsd-amd64", + "sha256": "b05b87621ede76447a3c5ad573aff393c3162dbf99ccc9bf0f01109537a1f7b9", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.28.0.netbsd-arm64", - "sha256": "73025c04ed1a1c7e4f28d679682afc1c476fe84b517cd007d1d53ded47b8f14d", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.netbsd-arm64" + "file": "buildx-v0.29.0.netbsd-arm64", + "sha256": "acf2c7f7be96ada4d21077e343fc611938f81a603da01c26295b86e810f1f2c4", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.28.0.openbsd-amd64", - "sha256": "634a04a692d9cdfda2165402a986ebc960dc72d1f9023ad3dca2aee12a434393", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.openbsd-amd64" + "file": "buildx-v0.29.0.openbsd-amd64", + "sha256": "f6e31c1185bc96298334cac9820a8887966882b41c28b726a68a36cdbbcc4598", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.28.0.openbsd-arm64", - "sha256": "d5f0387f7244b5abb91eb3dd6a0945cc67e2f19c434811af1cdd6970c9f19584", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.openbsd-arm64" + "file": "buildx-v0.29.0.openbsd-arm64", + "sha256": "b39797ac1647494166dc05f6241ddfc40f512031e66cde4c2bedaf78ee1feab7", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.28.0.linux-ppc64le", - "sha256": "a62b15276f1956c34491f967d01cc07fa794a9fd93b7e67e066b07d018af9790", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-ppc64le" + "file": "buildx-v0.29.0.linux-ppc64le", + "sha256": "eaaa77de28c79306be25ad992a1fbd537113bc3543ccac2a3e2e1855a752a665", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.28.0.linux-riscv64", - "sha256": "0136f808bab5f5e27da77236d45da5c8e62d4da019db057f495b1272a15263cf", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-riscv64" + "file": "buildx-v0.29.0.linux-riscv64", + "sha256": "16fcd25ec8ca6f15d6264133c3dc93cdce211fb2028b8cb529c0ea7b880c3818", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.28.0.linux-s390x", - "sha256": "3057b70f926388e3beb88869d6d028d5893abf18a94496128ca440a80ce130ce", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.linux-s390x" + "file": "buildx-v0.29.0.linux-s390x", + "sha256": "dec5db787903debb0f83012a416421e4119d7f28837ae7aa6ae5b689750285fe", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.28.0.windows-amd64.exe", - "sha256": "0e8d520269cbd3401de6fee5c5fe48d5a9750805aa0a04d5443eba6b33ba63ee", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-amd64.exe" + "file": "buildx-v0.29.0.windows-amd64.exe", + "sha256": "d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.28.0.windows-arm64.exe", - "sha256": "a110ebbf2379bcfbf72d533c283a133a44ffed14090279494ea74290291567d6", - "url": "https://github.com/docker/buildx/releases/download/v0.28.0/buildx-v0.28.0.windows-arm64.exe" + "file": "buildx-v0.29.0.windows-arm64.exe", + "sha256": "eb71e15ea22eea5152d1d72a999224baa4f65f4d2ee5845ea0c4fa1119dfc3ed", + "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-arm64.exe" } }, - "version": "0.28.0" + "version": "0.29.0" }, "compose": { "arches": { From 43bf4f4776f6fa4c32fd52b2719c9099a92bde2c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 2 Oct 2025 16:04:15 -0700 Subject: [PATCH 528/667] Update 28 to 28.5.0 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index dd0398b9a..bffb7c1b0 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.4.0 +ENV DOCKER_VERSION 28.5.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.5.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index 674441cb4..ecde808ff 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/dind-rootless/Dockerfile @@ -25,10 +25,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-28.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.5.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index ae255be2c..759bec626 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.5.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 22a4712fa..7f0b2f99f 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.4.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.4.0.zip +ENV DOCKER_VERSION 28.5.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.0.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 866ac5b71..c25b1bde9 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.4.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.4.0.zip +ENV DOCKER_VERSION 28.5.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.0.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/versions.json b/versions.json index 7fbc15379..62a58a4c2 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.4.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.5.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.5.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.5.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.5.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.4.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.5.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.4.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.5.0.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "28.4.0" + "version": "28.5.0" }, "28-rc": { "arches": { From aeea567a3079fe6b77087a233d30b4dffbc06d41 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 2 Oct 2025 16:06:12 -0700 Subject: [PATCH 529/667] Update 28-rc --- 28-rc/cli/Dockerfile | 167 ------------ 28-rc/cli/docker-entrypoint.sh | 61 ----- 28-rc/cli/modprobe.sh | 20 -- 28-rc/dind-rootless/Dockerfile | 55 ---- 28-rc/dind/Dockerfile | 108 -------- 28-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 171 +------------ 9 files changed, 1 insertion(+), 1001 deletions(-) delete mode 100644 28-rc/cli/Dockerfile delete mode 100755 28-rc/cli/docker-entrypoint.sh delete mode 100755 28-rc/cli/modprobe.sh delete mode 100644 28-rc/dind-rootless/Dockerfile delete mode 100644 28-rc/dind/Dockerfile delete mode 100755 28-rc/dind/dockerd-entrypoint.sh delete mode 100644 28-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 28-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28-rc/cli/Dockerfile b/28-rc/cli/Dockerfile deleted file mode 100644 index 842028df3..000000000 --- a/28-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.22 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 28.5.0-rc.1 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.5.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.5.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.5.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.5.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.29.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-amd64'; \ - sha256='d02d47061bede1b90d34bf6562a5f39e686773e97cf9d00e7114b3c1e269e524'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v6'; \ - sha256='7a90b222d33f2b70540ac9fa0d2d7feff02accb83a22c557c78f2ad924807ed5'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v7'; \ - sha256='4af7949022b2f5228990d7b9faab5cea8ac93edc6faf284d115fa33bbb367778'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm64'; \ - sha256='14e50940aef67c4b46f6b03a5ccc3851a30f883e751a61048a4bc80b8832a840'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-ppc64le'; \ - sha256='eaaa77de28c79306be25ad992a1fbd537113bc3543ccac2a3e2e1855a752a665'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-riscv64'; \ - sha256='16fcd25ec8ca6f15d6264133c3dc93cdce211fb2028b8cb529c0ea7b880c3818'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-s390x'; \ - sha256='dec5db787903debb0f83012a416421e4119d7f28837ae7aa6ae5b689750285fe'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.39.4 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-x86_64'; \ - sha256='7af95166a730b87e172d4fc9aefea8725d3c6c7327d59149267b452114ddb7d4'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv6'; \ - sha256='e376f677087bc5d85a19d24765fea400f88de2d18577dab0dd746961fcfe8804'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv7'; \ - sha256='c0d6fe1d2e1e3e8490804ef092793f3c0368c4458d0fcb86a7df8670a9d8ae78'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-aarch64'; \ - sha256='49082844b87f03cdcd5f5bbef1ba8c9c897b7a2dfb80cea18d61ec8ca6117e0c'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-ppc64le'; \ - sha256='a731c350b577926b11b986d1e54e2332bdef3647c55c90931000ad9e8434d0cc'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-riscv64'; \ - sha256='a7081ade7067a5486a81514d50adec82337e14cdcea5f2127edd6e45905fc0fa'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-s390x'; \ - sha256='4e32f5c43ffe7564d9a39f78d502fbdc17904e1b62add9c7939ec3bbd6de1af9'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/28-rc/cli/docker-entrypoint.sh b/28-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/28-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/28-rc/cli/modprobe.sh b/28-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/28-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/28-rc/dind-rootless/Dockerfile b/28-rc/dind-rootless/Dockerfile deleted file mode 100644 index 2ac59e7db..000000000 --- a/28-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-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 -# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.5.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.5.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/28-rc/dind/Dockerfile b/28-rc/dind/Dockerfile deleted file mode 100644 index bd894e292..000000000 --- a/28-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-28.5.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-28.5.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-28.5.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-28.5.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/28-rc/dind/dockerd-entrypoint.sh b/28-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 8a291dfa5..000000000 --- a/28-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile b/28-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index ca294b76b..000000000 --- a/28-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.5.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.5.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.29.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile b/28-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index 4c0e49cda..000000000 --- a/28-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.5.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.5.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.29.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 62a58a4c2..b09cb80d0 100644 --- a/versions.json +++ b/versions.json @@ -169,174 +169,5 @@ ], "version": "28.5.0" }, - "28-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-28.5.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.5.0-rc.1.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-28.5.0-rc.1.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-28.5.0-rc.1.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-28.5.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.5.0-rc.1.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-28.5.0-rc.1.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.29.0.linux-amd64", - "sha256": "d02d47061bede1b90d34bf6562a5f39e686773e97cf9d00e7114b3c1e269e524", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.29.0.linux-arm-v6", - "sha256": "7a90b222d33f2b70540ac9fa0d2d7feff02accb83a22c557c78f2ad924807ed5", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.29.0.linux-arm-v7", - "sha256": "4af7949022b2f5228990d7b9faab5cea8ac93edc6faf284d115fa33bbb367778", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.29.0.linux-arm64", - "sha256": "14e50940aef67c4b46f6b03a5ccc3851a30f883e751a61048a4bc80b8832a840", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.29.0.freebsd-amd64", - "sha256": "b6665e366f30b51162f3b145e01377659ae65f90b8dfad7cbb2ba01c40ce34ae", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.29.0.freebsd-arm64", - "sha256": "70d9482cffadb3c7a0e18ce3ac9d4ee1ff60bcfb99796e479df97a5dfe21eb30", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.29.0.netbsd-amd64", - "sha256": "b05b87621ede76447a3c5ad573aff393c3162dbf99ccc9bf0f01109537a1f7b9", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.29.0.netbsd-arm64", - "sha256": "acf2c7f7be96ada4d21077e343fc611938f81a603da01c26295b86e810f1f2c4", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.29.0.openbsd-amd64", - "sha256": "f6e31c1185bc96298334cac9820a8887966882b41c28b726a68a36cdbbcc4598", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.29.0.openbsd-arm64", - "sha256": "b39797ac1647494166dc05f6241ddfc40f512031e66cde4c2bedaf78ee1feab7", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.29.0.linux-ppc64le", - "sha256": "eaaa77de28c79306be25ad992a1fbd537113bc3543ccac2a3e2e1855a752a665", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.29.0.linux-riscv64", - "sha256": "16fcd25ec8ca6f15d6264133c3dc93cdce211fb2028b8cb529c0ea7b880c3818", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.29.0.linux-s390x", - "sha256": "dec5db787903debb0f83012a416421e4119d7f28837ae7aa6ae5b689750285fe", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.29.0.windows-amd64.exe", - "sha256": "d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.29.0.windows-arm64.exe", - "sha256": "eb71e15ea22eea5152d1d72a999224baa4f65f4d2ee5845ea0c4fa1119dfc3ed", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-arm64.exe" - } - }, - "version": "0.29.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "7af95166a730b87e172d4fc9aefea8725d3c6c7327d59149267b452114ddb7d4", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "e376f677087bc5d85a19d24765fea400f88de2d18577dab0dd746961fcfe8804", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "c0d6fe1d2e1e3e8490804ef092793f3c0368c4458d0fcb86a7df8670a9d8ae78", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "49082844b87f03cdcd5f5bbef1ba8c9c897b7a2dfb80cea18d61ec8ca6117e0c", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "ec56a48c47ff30db7626f980f36e48d9573114626c2beb6b76b47dd6ff4aa63c", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "718d09670f2017cdb7bfabccebdbf00b3f971a7e560afc13512b4334796e3cf0", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "a731c350b577926b11b986d1e54e2332bdef3647c55c90931000ad9e8434d0cc", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "a7081ade7067a5486a81514d50adec82337e14cdcea5f2127edd6e45905fc0fa", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "4e32f5c43ffe7564d9a39f78d502fbdc17904e1b62add9c7939ec3bbd6de1af9", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "f33df1eb9206432658276bbf0597b66b45fc0f3075a1c49a38b10f5ceb3a3590", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.39.4" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "28.5.0-rc.1" - } + "28-rc": null } From 7a890a0113c96479a67f9c4617ab0daee11482e6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 3 Oct 2025 10:04:25 -0700 Subject: [PATCH 530/667] Update 28 to buildx 0.29.1, compose 2.40.0 --- 28/cli/Dockerfile | 60 ++++---- .../windowsservercore-ltsc2022/Dockerfile | 12 +- .../windowsservercore-ltsc2025/Dockerfile | 12 +- versions.json | 138 +++++++++--------- 4 files changed, 111 insertions(+), 111 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index bffb7c1b0..5faeb5170 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.29.0 +ENV DOCKER_BUILDX_VERSION 0.29.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-amd64'; \ - sha256='d02d47061bede1b90d34bf6562a5f39e686773e97cf9d00e7114b3c1e269e524'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64'; \ + sha256='7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v6'; \ - sha256='7a90b222d33f2b70540ac9fa0d2d7feff02accb83a22c557c78f2ad924807ed5'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6'; \ + sha256='37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v7'; \ - sha256='4af7949022b2f5228990d7b9faab5cea8ac93edc6faf284d115fa33bbb367778'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7'; \ + sha256='ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm64'; \ - sha256='14e50940aef67c4b46f6b03a5ccc3851a30f883e751a61048a4bc80b8832a840'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64'; \ + sha256='50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-ppc64le'; \ - sha256='eaaa77de28c79306be25ad992a1fbd537113bc3543ccac2a3e2e1855a752a665'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le'; \ + sha256='04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-riscv64'; \ - sha256='16fcd25ec8ca6f15d6264133c3dc93cdce211fb2028b8cb529c0ea7b880c3818'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64'; \ + sha256='f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-s390x'; \ - sha256='dec5db787903debb0f83012a416421e4119d7f28837ae7aa6ae5b689750285fe'; \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x'; \ + sha256='3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.39.4 +ENV DOCKER_COMPOSE_VERSION 2.40.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-x86_64'; \ - sha256='7af95166a730b87e172d4fc9aefea8725d3c6c7327d59149267b452114ddb7d4'; \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-x86_64'; \ + sha256='bd5835ccbbf06a42dcb5294c65e34a4634b34447afb9ed6fc7adf18a000e0f99'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv6'; \ - sha256='e376f677087bc5d85a19d24765fea400f88de2d18577dab0dd746961fcfe8804'; \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv6'; \ + sha256='458294be13e0619118692aec3b6374e70c83d0dfcf16ae59437f349b64021948'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv7'; \ - sha256='c0d6fe1d2e1e3e8490804ef092793f3c0368c4458d0fcb86a7df8670a9d8ae78'; \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv7'; \ + sha256='12f853e0cbf02a069f01a5f41e3803815b6f7ae3a7574d6f792c8de36f1b7bfa'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-aarch64'; \ - sha256='49082844b87f03cdcd5f5bbef1ba8c9c897b7a2dfb80cea18d61ec8ca6117e0c'; \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-aarch64'; \ + sha256='fa99ca94c96c8cae4024493581a20049764ce723558991d0d1526c1c7b791a79'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-ppc64le'; \ - sha256='a731c350b577926b11b986d1e54e2332bdef3647c55c90931000ad9e8434d0cc'; \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-ppc64le'; \ + sha256='aec0a582aeafec11a77c8b866e3d5ae42872a33bf457520a4bfc8436a96327d0'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-riscv64'; \ - sha256='a7081ade7067a5486a81514d50adec82337e14cdcea5f2127edd6e45905fc0fa'; \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-riscv64'; \ + sha256='5f9778000b556c2240942e95b61b24834d9f46f52ac294c5ea0d22f187fbde48'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-s390x'; \ - sha256='4e32f5c43ffe7564d9a39f78d502fbdc17904e1b62add9c7939ec3bbd6de1af9'; \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-s390x'; \ + sha256='2642108b41b19fe48e777632ed0def6289b14a054f427ac54b6130d7f95b9909'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 7f0b2f99f..d4da6bec6 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.29.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26 +ENV DOCKER_BUILDX_VERSION 0.29.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955 +ENV DOCKER_COMPOSE_VERSION 2.40.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index c25b1bde9..8e8a0a8e1 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.29.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26 +ENV DOCKER_BUILDX_VERSION 0.29.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.39.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955 +ENV DOCKER_COMPOSE_VERSION 2.40.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b09cb80d0..5791cd9ff 100644 --- a/versions.json +++ b/versions.json @@ -22,142 +22,142 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.29.0.linux-amd64", - "sha256": "d02d47061bede1b90d34bf6562a5f39e686773e97cf9d00e7114b3c1e269e524", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-amd64" + "file": "buildx-v0.29.1.linux-amd64", + "sha256": "7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.29.0.linux-arm-v6", - "sha256": "7a90b222d33f2b70540ac9fa0d2d7feff02accb83a22c557c78f2ad924807ed5", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v6" + "file": "buildx-v0.29.1.linux-arm-v6", + "sha256": "37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.29.0.linux-arm-v7", - "sha256": "4af7949022b2f5228990d7b9faab5cea8ac93edc6faf284d115fa33bbb367778", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm-v7" + "file": "buildx-v0.29.1.linux-arm-v7", + "sha256": "ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.29.0.linux-arm64", - "sha256": "14e50940aef67c4b46f6b03a5ccc3851a30f883e751a61048a4bc80b8832a840", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-arm64" + "file": "buildx-v0.29.1.linux-arm64", + "sha256": "50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.29.0.freebsd-amd64", - "sha256": "b6665e366f30b51162f3b145e01377659ae65f90b8dfad7cbb2ba01c40ce34ae", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.freebsd-amd64" + "file": "buildx-v0.29.1.freebsd-amd64", + "sha256": "80621ca4e7e447b66d71200454265590781809761c5baf195d8c21d274ebc97a", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.29.0.freebsd-arm64", - "sha256": "70d9482cffadb3c7a0e18ce3ac9d4ee1ff60bcfb99796e479df97a5dfe21eb30", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.freebsd-arm64" + "file": "buildx-v0.29.1.freebsd-arm64", + "sha256": "e2f8c835458143cba0c5628658517ed361138768f4f54196fd71c2e86bb42cd5", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.29.0.netbsd-amd64", - "sha256": "b05b87621ede76447a3c5ad573aff393c3162dbf99ccc9bf0f01109537a1f7b9", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.netbsd-amd64" + "file": "buildx-v0.29.1.netbsd-amd64", + "sha256": "86c3973a56d6acd1f5aefcb88b9ed5d6215f79af57e368160e18cdcfbe1a1d59", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.29.0.netbsd-arm64", - "sha256": "acf2c7f7be96ada4d21077e343fc611938f81a603da01c26295b86e810f1f2c4", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.netbsd-arm64" + "file": "buildx-v0.29.1.netbsd-arm64", + "sha256": "c9346d24cc2051635bb3bc656869aa64a584f80a284d3f7a3d44802f26d57595", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.29.0.openbsd-amd64", - "sha256": "f6e31c1185bc96298334cac9820a8887966882b41c28b726a68a36cdbbcc4598", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.openbsd-amd64" + "file": "buildx-v0.29.1.openbsd-amd64", + "sha256": "9a7bbc02ba0897a64ae5674630c74b4d2539176d903a6f9c26209b03591f69d6", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.29.0.openbsd-arm64", - "sha256": "b39797ac1647494166dc05f6241ddfc40f512031e66cde4c2bedaf78ee1feab7", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.openbsd-arm64" + "file": "buildx-v0.29.1.openbsd-arm64", + "sha256": "810ea3aa794fb5e91d3fd860a14201ac6308499328ae6c461e2e0879662eca8e", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.29.0.linux-ppc64le", - "sha256": "eaaa77de28c79306be25ad992a1fbd537113bc3543ccac2a3e2e1855a752a665", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-ppc64le" + "file": "buildx-v0.29.1.linux-ppc64le", + "sha256": "04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.29.0.linux-riscv64", - "sha256": "16fcd25ec8ca6f15d6264133c3dc93cdce211fb2028b8cb529c0ea7b880c3818", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-riscv64" + "file": "buildx-v0.29.1.linux-riscv64", + "sha256": "f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.29.0.linux-s390x", - "sha256": "dec5db787903debb0f83012a416421e4119d7f28837ae7aa6ae5b689750285fe", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.linux-s390x" + "file": "buildx-v0.29.1.linux-s390x", + "sha256": "3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.29.0.windows-amd64.exe", - "sha256": "d58e5a3eeef59fff460cc2a7f3b501222ce137e6afeb4cc528c658d9363cac26", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-amd64.exe" + "file": "buildx-v0.29.1.windows-amd64.exe", + "sha256": "3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.29.0.windows-arm64.exe", - "sha256": "eb71e15ea22eea5152d1d72a999224baa4f65f4d2ee5845ea0c4fa1119dfc3ed", - "url": "https://github.com/docker/buildx/releases/download/v0.29.0/buildx-v0.29.0.windows-arm64.exe" + "file": "buildx-v0.29.1.windows-arm64.exe", + "sha256": "2e1e5a3603ef9c92cef386ea8a6ffc300854247737686c6e9af47c308dec19c8", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-arm64.exe" } }, - "version": "0.29.0" + "version": "0.29.1" }, "compose": { "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "7af95166a730b87e172d4fc9aefea8725d3c6c7327d59149267b452114ddb7d4", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-x86_64" + "sha256": "bd5835ccbbf06a42dcb5294c65e34a4634b34447afb9ed6fc7adf18a000e0f99", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "e376f677087bc5d85a19d24765fea400f88de2d18577dab0dd746961fcfe8804", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv6" + "sha256": "458294be13e0619118692aec3b6374e70c83d0dfcf16ae59437f349b64021948", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "c0d6fe1d2e1e3e8490804ef092793f3c0368c4458d0fcb86a7df8670a9d8ae78", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-armv7" + "sha256": "12f853e0cbf02a069f01a5f41e3803815b6f7ae3a7574d6f792c8de36f1b7bfa", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "49082844b87f03cdcd5f5bbef1ba8c9c897b7a2dfb80cea18d61ec8ca6117e0c", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-aarch64" + "sha256": "fa99ca94c96c8cae4024493581a20049764ce723558991d0d1526c1c7b791a79", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "ec56a48c47ff30db7626f980f36e48d9573114626c2beb6b76b47dd6ff4aa63c", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-darwin-x86_64" + "sha256": "ca2ee9184773f8e0d21a3387320dabde4d853cd39dd3befd2ba2e05d9c81b72d", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "718d09670f2017cdb7bfabccebdbf00b3f971a7e560afc13512b4334796e3cf0", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-darwin-aarch64" + "sha256": "fdf30e455f3dfa4be10b447f14ec37a355c4200f950dd389c0708a7ab0ce6f98", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "a731c350b577926b11b986d1e54e2332bdef3647c55c90931000ad9e8434d0cc", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-ppc64le" + "sha256": "aec0a582aeafec11a77c8b866e3d5ae42872a33bf457520a4bfc8436a96327d0", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "a7081ade7067a5486a81514d50adec82337e14cdcea5f2127edd6e45905fc0fa", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-riscv64" + "sha256": "5f9778000b556c2240942e95b61b24834d9f46f52ac294c5ea0d22f187fbde48", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "4e32f5c43ffe7564d9a39f78d502fbdc17904e1b62add9c7939ec3bbd6de1af9", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-s390x" + "sha256": "2642108b41b19fe48e777632ed0def6289b14a054f427ac54b6130d7f95b9909", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "6b3bccfabcdd172e1d9e15d011b54c9b5b13b93b1153148108f55e4349055955", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-x86_64.exe" + "sha256": "835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "f33df1eb9206432658276bbf0597b66b45fc0f3075a1c49a38b10f5ceb3a3590", - "url": "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-windows-aarch64.exe" + "sha256": "edd7d5b17800835e29261bbd64eee1ffb2d7793230a6c68616750f1254bc9f14", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.39.4" + "version": "2.40.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From b510c2bbe64b878dee6480992ab5d8cd9c02027d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 8 Oct 2025 09:45:42 -0700 Subject: [PATCH 531/667] Update 28 to 28.5.1 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 5faeb5170..dda68ce5d 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.5.0 +ENV DOCKER_VERSION 28.5.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.5.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index ecde808ff..309f643ca 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/dind-rootless/Dockerfile @@ -25,10 +25,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-28.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.5.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index 759bec626..d9fa0d60e 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.5.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index d4da6bec6..2c6cfdddf 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.5.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.0.zip +ENV DOCKER_VERSION 28.5.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.1.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 8e8a0a8e1..6681e531a 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.5.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.0.zip +ENV DOCKER_VERSION 28.5.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.1.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/versions.json b/versions.json index 5791cd9ff..a06abe699 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.5.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.5.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.5.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.5.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.5.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.5.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.5.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.5.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.5.1.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "28.5.0" + "version": "28.5.1" }, "28-rc": null } From 0e64a2891cbfc4d9ef294ebb43f4c7cd5b23ded4 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Tue, 14 Oct 2025 17:10:07 +0200 Subject: [PATCH 532/667] Add support for docker-prefixed git tags This is the new standard format; see also https://github.com/moby/moby/releases/tag/docker-v29.0.0-rc.1 --- versions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.sh b/versions.sh index 6a41c01f8..83b587b8d 100755 --- a/versions.sh +++ b/versions.sh @@ -46,8 +46,8 @@ dindLatest="$( dockerVersions="$( git ls-remote --tags https://github.com/docker/docker.git \ | cut -d$'\t' -f2 \ - | grep '^refs/tags/v[0-9].*$' \ - | sed 's!^refs/tags/v!!; s!\^{}$!!' \ + | grep '^refs/tags/\(docker-\)\?v[0-9].*$' \ + | sed 's!^refs/tags/\(docker-\)\?v!!; s!\^{}$!!' \ | sort -u \ | gawk ' { data[lines++] = $0 } From 3cb6ed40f1274ee9041835533bb625cf55f63e91 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Tue, 14 Oct 2025 17:11:51 +0200 Subject: [PATCH 533/667] Add 29.0.0-rc.1 --- 29-rc/cli/Dockerfile | 167 ++++++++++++ 29-rc/cli/docker-entrypoint.sh | 61 +++++ 29-rc/cli/modprobe.sh | 20 ++ 29-rc/dind-rootless/Dockerfile | 55 ++++ 29-rc/dind/Dockerfile | 108 ++++++++ 29-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 173 ++++++++++++- 9 files changed, 1003 insertions(+), 1 deletion(-) create mode 100644 29-rc/cli/Dockerfile create mode 100755 29-rc/cli/docker-entrypoint.sh create mode 100755 29-rc/cli/modprobe.sh create mode 100644 29-rc/dind-rootless/Dockerfile create mode 100644 29-rc/dind/Dockerfile create mode 100755 29-rc/dind/dockerd-entrypoint.sh create mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile new file mode 100644 index 000000000..0bc446c6b --- /dev/null +++ b/29-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.22 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 29.0.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.29.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64'; \ + sha256='7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6'; \ + sha256='37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7'; \ + sha256='ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64'; \ + sha256='50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le'; \ + sha256='04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64'; \ + sha256='f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x'; \ + sha256='3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.40.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-x86_64'; \ + sha256='bd5835ccbbf06a42dcb5294c65e34a4634b34447afb9ed6fc7adf18a000e0f99'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv6'; \ + sha256='458294be13e0619118692aec3b6374e70c83d0dfcf16ae59437f349b64021948'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv7'; \ + sha256='12f853e0cbf02a069f01a5f41e3803815b6f7ae3a7574d6f792c8de36f1b7bfa'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-aarch64'; \ + sha256='fa99ca94c96c8cae4024493581a20049764ce723558991d0d1526c1c7b791a79'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-ppc64le'; \ + sha256='aec0a582aeafec11a77c8b866e3d5ae42872a33bf457520a4bfc8436a96327d0'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-riscv64'; \ + sha256='5f9778000b556c2240942e95b61b24834d9f46f52ac294c5ea0d22f187fbde48'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-s390x'; \ + sha256='2642108b41b19fe48e777632ed0def6289b14a054f427ac54b6130d7f95b9909'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/29-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/29-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..85875ba82 --- /dev/null +++ b/29-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-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 +# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile new file mode 100644 index 000000000..ec5478101 --- /dev/null +++ b/29-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..8a291dfa5 --- /dev/null +++ b/29-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..f5564e5e3 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.29.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.40.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..a9c127a0b --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.0.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.29.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.40.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index a06abe699..8e4a587c9 100644 --- a/versions.json +++ b/versions.json @@ -169,5 +169,176 @@ ], "version": "28.5.1" }, - "28-rc": null + "28-rc": null, + "29": null, + "29-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.29.1.linux-amd64", + "sha256": "7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.29.1.linux-arm-v6", + "sha256": "37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.29.1.linux-arm-v7", + "sha256": "ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.29.1.linux-arm64", + "sha256": "50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.29.1.freebsd-amd64", + "sha256": "80621ca4e7e447b66d71200454265590781809761c5baf195d8c21d274ebc97a", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.29.1.freebsd-arm64", + "sha256": "e2f8c835458143cba0c5628658517ed361138768f4f54196fd71c2e86bb42cd5", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.29.1.netbsd-amd64", + "sha256": "86c3973a56d6acd1f5aefcb88b9ed5d6215f79af57e368160e18cdcfbe1a1d59", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.29.1.netbsd-arm64", + "sha256": "c9346d24cc2051635bb3bc656869aa64a584f80a284d3f7a3d44802f26d57595", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.29.1.openbsd-amd64", + "sha256": "9a7bbc02ba0897a64ae5674630c74b4d2539176d903a6f9c26209b03591f69d6", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.29.1.openbsd-arm64", + "sha256": "810ea3aa794fb5e91d3fd860a14201ac6308499328ae6c461e2e0879662eca8e", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.29.1.linux-ppc64le", + "sha256": "04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.29.1.linux-riscv64", + "sha256": "f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.29.1.linux-s390x", + "sha256": "3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.29.1.windows-amd64.exe", + "sha256": "3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.29.1.windows-arm64.exe", + "sha256": "2e1e5a3603ef9c92cef386ea8a6ffc300854247737686c6e9af47c308dec19c8", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-arm64.exe" + } + }, + "version": "0.29.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "bd5835ccbbf06a42dcb5294c65e34a4634b34447afb9ed6fc7adf18a000e0f99", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "458294be13e0619118692aec3b6374e70c83d0dfcf16ae59437f349b64021948", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "12f853e0cbf02a069f01a5f41e3803815b6f7ae3a7574d6f792c8de36f1b7bfa", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "fa99ca94c96c8cae4024493581a20049764ce723558991d0d1526c1c7b791a79", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "ca2ee9184773f8e0d21a3387320dabde4d853cd39dd3befd2ba2e05d9c81b72d", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "fdf30e455f3dfa4be10b447f14ec37a355c4200f950dd389c0708a7ab0ce6f98", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "aec0a582aeafec11a77c8b866e3d5ae42872a33bf457520a4bfc8436a96327d0", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "5f9778000b556c2240942e95b61b24834d9f46f52ac294c5ea0d22f187fbde48", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "2642108b41b19fe48e777632ed0def6289b14a054f427ac54b6130d7f95b9909", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "edd7d5b17800835e29261bbd64eee1ffb2d7793230a6c68616750f1254bc9f14", + "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.40.0" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "29.0.0-rc.1" + } } From e99c982bc164268363f402f79187afe43fea9626 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 14 Oct 2025 11:21:26 -0700 Subject: [PATCH 534/667] =?UTF-8?q?Replace=20wild=20unix=20pipelines=20wit?= =?UTF-8?q?h=20simpler=20jq=20=F0=9F=8F=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also, update all three "version scraping" commands to scrape versions in descending order to reduce the overall cognitive load. --- versions.sh | 57 ++++++++++++++--------------------------------------- 1 file changed, 15 insertions(+), 42 deletions(-) diff --git a/versions.sh b/versions.sh index 83b587b8d..0803f1e10 100755 --- a/versions.sh +++ b/versions.sh @@ -45,47 +45,20 @@ dindLatest="$( dockerVersions="$( git ls-remote --tags https://github.com/docker/docker.git \ - | cut -d$'\t' -f2 \ - | grep '^refs/tags/\(docker-\)\?v[0-9].*$' \ - | sed 's!^refs/tags/\(docker-\)\?v!!; s!\^{}$!!' \ - | sort -u \ - | gawk ' - { data[lines++] = $0 } - - # "beta" sorts lower than "tp" even though "beta" is a more preferred release, so we need to explicitly adjust the sorting order for RCs - # also, "18.09.0-ce-beta1" vs "18.09.0-beta3" - function docker_version_compare(i1, v1, i2, v2, l, r) { - l = v1; gsub(/-ce/, "", l); gsub(/-tp/, "-alpha", l) - r = v2; gsub(/-ce/, "", r); gsub(/-tp/, "-alpha", r) - patsplit(l, ltemp, /[^.-]+/) - patsplit(r, rtemp, /[^.-]+/) - for (i = 0; i < length(ltemp) && i < length(rtemp); ++i) { - if (ltemp[i] < rtemp[i]) { - return -1 - } - if (ltemp[i] > rtemp[i]) { - return 1 - } - } - return 0 - } - - END { - asort(data, result, "docker_version_compare") - for (i in result) { - print result[i] - } - } + | jq --raw-input --null-input --raw-output ' + [ inputs | capture("refs/tags/(docker-)?v(?[0-9.a-z-]+)($|\\^)") | .version ] + | unique_by( split(".") | map(tonumber? // .) ) + | reverse[] ' )" buildxVersions="$( git ls-remote --tags https://github.com/docker/buildx.git \ - | cut -d$'\t' -f2 \ - | grep '^refs/tags/v[0-9].*$' \ - | sed 's!^refs/tags/v!!; s!\^{}$!!' \ - | grep -vE -- '-rc' \ - | sort -ruV + | jq --raw-input --null-input --raw-output ' + [ inputs | capture("refs/tags/v(?[0-9.]+)($|\\^)") | .version ] + | unique_by( split(".") | map(tonumber? // .) ) + | reverse[] + ' )" buildx= buildxVersion= @@ -133,11 +106,11 @@ fi composeVersions="$( git ls-remote --tags https://github.com/docker/compose.git \ - | cut -d$'\t' -f2 \ - | grep '^refs/tags/v[0-9].*$' \ - | sed 's!^refs/tags/v!!; s!\^{}$!!' \ - | grep -vE -- '-[a-zA-Z]' \ - | sort -ruV + | jq --raw-input --null-input --raw-output ' + [ inputs | capture("refs/tags/v(?[0-9.]+)($|\\^)") | .version ] + | unique_by( split(".") | map(tonumber? // .) ) + | reverse[] + ' )" compose= composeVersion= @@ -196,7 +169,7 @@ for version in "${versions[@]}"; do channel='test' fi - if ! fullVersion="$(grep $rcGrepV -E -- '-(rc|tp|beta)' <<<"$versionOptions" | tail -1)" || [ -z "$fullVersion" ]; then + if ! fullVersion="$(grep $rcGrepV -E -- '-(rc|tp|beta)' <<<"$versionOptions" | head -1)" || [ -z "$fullVersion" ]; then if currentNull="$(jq -r '.[env.version] == null' versions.json)" && [ "$currentNull" = 'true' ]; then echo >&2 "warning: skipping '$version' (does not appear to be released yet)" json="$(jq <<<"$json" -c '.[env.version] = null')" From e81567e5a1418e2541c1fa0879615739359d54aa Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 17 Oct 2025 10:04:14 -0700 Subject: [PATCH 535/667] Update 28 to compose 2.40.1 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index dda68ce5d..531b7dabe 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.40.0 +ENV DOCKER_COMPOSE_VERSION 2.40.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-x86_64'; \ - sha256='bd5835ccbbf06a42dcb5294c65e34a4634b34447afb9ed6fc7adf18a000e0f99'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-x86_64'; \ + sha256='5bc26235e4de0be2aa350c13c33bd226d760d3b44cbd29820708788e02a2b6f2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv6'; \ - sha256='458294be13e0619118692aec3b6374e70c83d0dfcf16ae59437f349b64021948'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv6'; \ + sha256='9b2cb71e4a5b4ca7a30d87fdaf21af33cb733f1e4b61b49084d03be0fe9f49ba'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv7'; \ - sha256='12f853e0cbf02a069f01a5f41e3803815b6f7ae3a7574d6f792c8de36f1b7bfa'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv7'; \ + sha256='a734e4a40041444262ef42accb8ff95f30cf63f24b1615593519aee7c5ec1d86'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-aarch64'; \ - sha256='fa99ca94c96c8cae4024493581a20049764ce723558991d0d1526c1c7b791a79'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-aarch64'; \ + sha256='ec4a385c4cd2afa4f5d429e6fe7dd6b2ae3dc251dc4e9332f1ad2cef8fa44554'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-ppc64le'; \ - sha256='aec0a582aeafec11a77c8b866e3d5ae42872a33bf457520a4bfc8436a96327d0'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-ppc64le'; \ + sha256='07d116049fd92c3fe0c437471049307d2e37aa34ffaabced8f943e7fbb569c93'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-riscv64'; \ - sha256='5f9778000b556c2240942e95b61b24834d9f46f52ac294c5ea0d22f187fbde48'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-riscv64'; \ + sha256='78886d10ad45bc5144835ce6ab9ef38a7bf43e709c9b0db002645ea7cfa458c0'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-s390x'; \ - sha256='2642108b41b19fe48e777632ed0def6289b14a054f427ac54b6130d7f95b9909'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-s390x'; \ + sha256='634ce369c36d37faa9b454b01898de9709e8f34fd1cd263dcb3b548d0bc327a8'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 2c6cfdddf..6e34ff027 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df +ENV DOCKER_COMPOSE_VERSION 2.40.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 6681e531a..0549617fa 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df +ENV DOCKER_COMPOSE_VERSION 2.40.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 8e4a587c9..e4246a9ca 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "bd5835ccbbf06a42dcb5294c65e34a4634b34447afb9ed6fc7adf18a000e0f99", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-x86_64" + "sha256": "5bc26235e4de0be2aa350c13c33bd226d760d3b44cbd29820708788e02a2b6f2", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "458294be13e0619118692aec3b6374e70c83d0dfcf16ae59437f349b64021948", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv6" + "sha256": "9b2cb71e4a5b4ca7a30d87fdaf21af33cb733f1e4b61b49084d03be0fe9f49ba", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "12f853e0cbf02a069f01a5f41e3803815b6f7ae3a7574d6f792c8de36f1b7bfa", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv7" + "sha256": "a734e4a40041444262ef42accb8ff95f30cf63f24b1615593519aee7c5ec1d86", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "fa99ca94c96c8cae4024493581a20049764ce723558991d0d1526c1c7b791a79", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-aarch64" + "sha256": "ec4a385c4cd2afa4f5d429e6fe7dd6b2ae3dc251dc4e9332f1ad2cef8fa44554", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "ca2ee9184773f8e0d21a3387320dabde4d853cd39dd3befd2ba2e05d9c81b72d", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-darwin-x86_64" + "sha256": "436ef3c7faa58517466ea37268d5d558223df87ea43893db141984b87b4e5e16", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "fdf30e455f3dfa4be10b447f14ec37a355c4200f950dd389c0708a7ab0ce6f98", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-darwin-aarch64" + "sha256": "127dfb1c730048594b0bc39a82407fc67e161f11b1bd2337d4c143e6e06fa4a7", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "aec0a582aeafec11a77c8b866e3d5ae42872a33bf457520a4bfc8436a96327d0", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-ppc64le" + "sha256": "07d116049fd92c3fe0c437471049307d2e37aa34ffaabced8f943e7fbb569c93", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "5f9778000b556c2240942e95b61b24834d9f46f52ac294c5ea0d22f187fbde48", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-riscv64" + "sha256": "78886d10ad45bc5144835ce6ab9ef38a7bf43e709c9b0db002645ea7cfa458c0", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2642108b41b19fe48e777632ed0def6289b14a054f427ac54b6130d7f95b9909", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-s390x" + "sha256": "634ce369c36d37faa9b454b01898de9709e8f34fd1cd263dcb3b548d0bc327a8", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe" + "sha256": "bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "edd7d5b17800835e29261bbd64eee1ffb2d7793230a6c68616750f1254bc9f14", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-aarch64.exe" + "sha256": "75ddd3a2f0121efee3ac241e0f4f9f9c8b37d39a6f126a5d5d89d9909cb9001f", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.40.0" + "version": "2.40.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 4a7695fb2626507bf0a3a6f755a876f5177ccc63 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 17 Oct 2025 10:06:19 -0700 Subject: [PATCH 536/667] Update 29-rc to compose 2.40.1 --- 29-rc/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 0bc446c6b..dd95d3688 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.40.0 +ENV DOCKER_COMPOSE_VERSION 2.40.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-x86_64'; \ - sha256='bd5835ccbbf06a42dcb5294c65e34a4634b34447afb9ed6fc7adf18a000e0f99'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-x86_64'; \ + sha256='5bc26235e4de0be2aa350c13c33bd226d760d3b44cbd29820708788e02a2b6f2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv6'; \ - sha256='458294be13e0619118692aec3b6374e70c83d0dfcf16ae59437f349b64021948'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv6'; \ + sha256='9b2cb71e4a5b4ca7a30d87fdaf21af33cb733f1e4b61b49084d03be0fe9f49ba'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv7'; \ - sha256='12f853e0cbf02a069f01a5f41e3803815b6f7ae3a7574d6f792c8de36f1b7bfa'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv7'; \ + sha256='a734e4a40041444262ef42accb8ff95f30cf63f24b1615593519aee7c5ec1d86'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-aarch64'; \ - sha256='fa99ca94c96c8cae4024493581a20049764ce723558991d0d1526c1c7b791a79'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-aarch64'; \ + sha256='ec4a385c4cd2afa4f5d429e6fe7dd6b2ae3dc251dc4e9332f1ad2cef8fa44554'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-ppc64le'; \ - sha256='aec0a582aeafec11a77c8b866e3d5ae42872a33bf457520a4bfc8436a96327d0'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-ppc64le'; \ + sha256='07d116049fd92c3fe0c437471049307d2e37aa34ffaabced8f943e7fbb569c93'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-riscv64'; \ - sha256='5f9778000b556c2240942e95b61b24834d9f46f52ac294c5ea0d22f187fbde48'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-riscv64'; \ + sha256='78886d10ad45bc5144835ce6ab9ef38a7bf43e709c9b0db002645ea7cfa458c0'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-s390x'; \ - sha256='2642108b41b19fe48e777632ed0def6289b14a054f427ac54b6130d7f95b9909'; \ + url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-s390x'; \ + sha256='634ce369c36d37faa9b454b01898de9709e8f34fd1cd263dcb3b548d0bc327a8'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index f5564e5e3..000a68d2b 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df +ENV DOCKER_COMPOSE_VERSION 2.40.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index a9c127a0b..f20331632 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df +ENV DOCKER_COMPOSE_VERSION 2.40.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index e4246a9ca..14fac159d 100644 --- a/versions.json +++ b/versions.json @@ -275,61 +275,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "bd5835ccbbf06a42dcb5294c65e34a4634b34447afb9ed6fc7adf18a000e0f99", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-x86_64" + "sha256": "5bc26235e4de0be2aa350c13c33bd226d760d3b44cbd29820708788e02a2b6f2", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "458294be13e0619118692aec3b6374e70c83d0dfcf16ae59437f349b64021948", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv6" + "sha256": "9b2cb71e4a5b4ca7a30d87fdaf21af33cb733f1e4b61b49084d03be0fe9f49ba", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "12f853e0cbf02a069f01a5f41e3803815b6f7ae3a7574d6f792c8de36f1b7bfa", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-armv7" + "sha256": "a734e4a40041444262ef42accb8ff95f30cf63f24b1615593519aee7c5ec1d86", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "fa99ca94c96c8cae4024493581a20049764ce723558991d0d1526c1c7b791a79", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-aarch64" + "sha256": "ec4a385c4cd2afa4f5d429e6fe7dd6b2ae3dc251dc4e9332f1ad2cef8fa44554", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "ca2ee9184773f8e0d21a3387320dabde4d853cd39dd3befd2ba2e05d9c81b72d", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-darwin-x86_64" + "sha256": "436ef3c7faa58517466ea37268d5d558223df87ea43893db141984b87b4e5e16", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "fdf30e455f3dfa4be10b447f14ec37a355c4200f950dd389c0708a7ab0ce6f98", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-darwin-aarch64" + "sha256": "127dfb1c730048594b0bc39a82407fc67e161f11b1bd2337d4c143e6e06fa4a7", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "aec0a582aeafec11a77c8b866e3d5ae42872a33bf457520a4bfc8436a96327d0", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-ppc64le" + "sha256": "07d116049fd92c3fe0c437471049307d2e37aa34ffaabced8f943e7fbb569c93", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "5f9778000b556c2240942e95b61b24834d9f46f52ac294c5ea0d22f187fbde48", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-riscv64" + "sha256": "78886d10ad45bc5144835ce6ab9ef38a7bf43e709c9b0db002645ea7cfa458c0", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "2642108b41b19fe48e777632ed0def6289b14a054f427ac54b6130d7f95b9909", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-linux-s390x" + "sha256": "634ce369c36d37faa9b454b01898de9709e8f34fd1cd263dcb3b548d0bc327a8", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "835b6a7150d12e128fa9fd902abff6212ff3e55398683d57e213956558ead5df", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-x86_64.exe" + "sha256": "bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "edd7d5b17800835e29261bbd64eee1ffb2d7793230a6c68616750f1254bc9f14", - "url": "https://github.com/docker/compose/releases/download/v2.40.0/docker-compose-windows-aarch64.exe" + "sha256": "75ddd3a2f0121efee3ac241e0f4f9f9c8b37d39a6f126a5d5d89d9909cb9001f", + "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-aarch64.exe" } }, - "version": "2.40.0" + "version": "2.40.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 8c54b7f8bb0a93d5c39b6907382c5d6fd6c5e6cd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 Oct 2025 16:04:14 -0700 Subject: [PATCH 537/667] Update 28 to compose 2.40.2 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 531b7dabe..f18b4db92 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.40.1 +ENV DOCKER_COMPOSE_VERSION 2.40.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-x86_64'; \ - sha256='5bc26235e4de0be2aa350c13c33bd226d760d3b44cbd29820708788e02a2b6f2'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-x86_64'; \ + sha256='6c964d9655cd629ef43c5dc75d9612c2da319237debee54a7aef217e9f362b88'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv6'; \ - sha256='9b2cb71e4a5b4ca7a30d87fdaf21af33cb733f1e4b61b49084d03be0fe9f49ba'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv6'; \ + sha256='478c4ff43dc88726a222299a8f09402598978995b2c0cbcb5881e2d27930b1c4'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv7'; \ - sha256='a734e4a40041444262ef42accb8ff95f30cf63f24b1615593519aee7c5ec1d86'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv7'; \ + sha256='3760c19baf87386bfcee19f9ef40a948d86f6e89b1a101a06910e028ab5296f0'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-aarch64'; \ - sha256='ec4a385c4cd2afa4f5d429e6fe7dd6b2ae3dc251dc4e9332f1ad2cef8fa44554'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-aarch64'; \ + sha256='20e30dda8d0133895b7991bcfec1eb2c02f9d38c8de9e73669daf9fb83df49e6'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-ppc64le'; \ - sha256='07d116049fd92c3fe0c437471049307d2e37aa34ffaabced8f943e7fbb569c93'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-ppc64le'; \ + sha256='124996cdb350d8e53bb15bc31748d23c17f74001cab3615232da60ada683371e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-riscv64'; \ - sha256='78886d10ad45bc5144835ce6ab9ef38a7bf43e709c9b0db002645ea7cfa458c0'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-riscv64'; \ + sha256='6f336a6bbc8cbe60da055ff9e1fc9c0cb698cecbfe52c3debd783103b3c4757b'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-s390x'; \ - sha256='634ce369c36d37faa9b454b01898de9709e8f34fd1cd263dcb3b548d0bc327a8'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-s390x'; \ + sha256='0338a528d4a9d31b7b498ae0883f87f96bb4058b0a4e56d1b2e3ce12049b2bf6'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 6e34ff027..64e005bcd 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e +ENV DOCKER_COMPOSE_VERSION 2.40.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 0549617fa..a291fab02 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e +ENV DOCKER_COMPOSE_VERSION 2.40.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 14fac159d..e233f0a1b 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "5bc26235e4de0be2aa350c13c33bd226d760d3b44cbd29820708788e02a2b6f2", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-x86_64" + "sha256": "6c964d9655cd629ef43c5dc75d9612c2da319237debee54a7aef217e9f362b88", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "9b2cb71e4a5b4ca7a30d87fdaf21af33cb733f1e4b61b49084d03be0fe9f49ba", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv6" + "sha256": "478c4ff43dc88726a222299a8f09402598978995b2c0cbcb5881e2d27930b1c4", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "a734e4a40041444262ef42accb8ff95f30cf63f24b1615593519aee7c5ec1d86", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv7" + "sha256": "3760c19baf87386bfcee19f9ef40a948d86f6e89b1a101a06910e028ab5296f0", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "ec4a385c4cd2afa4f5d429e6fe7dd6b2ae3dc251dc4e9332f1ad2cef8fa44554", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-aarch64" + "sha256": "20e30dda8d0133895b7991bcfec1eb2c02f9d38c8de9e73669daf9fb83df49e6", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "436ef3c7faa58517466ea37268d5d558223df87ea43893db141984b87b4e5e16", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-darwin-x86_64" + "sha256": "f6b1a46b31647077a1b707f223ec80d21015d948c821338fec3477418b3d6f6c", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "127dfb1c730048594b0bc39a82407fc67e161f11b1bd2337d4c143e6e06fa4a7", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-darwin-aarch64" + "sha256": "cc3a8774fdadf65b53a12ef54b3e0e63f2267e1e843ebfa46c4976fc4f80b46b", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "07d116049fd92c3fe0c437471049307d2e37aa34ffaabced8f943e7fbb569c93", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-ppc64le" + "sha256": "124996cdb350d8e53bb15bc31748d23c17f74001cab3615232da60ada683371e", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "78886d10ad45bc5144835ce6ab9ef38a7bf43e709c9b0db002645ea7cfa458c0", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-riscv64" + "sha256": "6f336a6bbc8cbe60da055ff9e1fc9c0cb698cecbfe52c3debd783103b3c4757b", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "634ce369c36d37faa9b454b01898de9709e8f34fd1cd263dcb3b548d0bc327a8", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-s390x" + "sha256": "0338a528d4a9d31b7b498ae0883f87f96bb4058b0a4e56d1b2e3ce12049b2bf6", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe" + "sha256": "1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "75ddd3a2f0121efee3ac241e0f4f9f9c8b37d39a6f126a5d5d89d9909cb9001f", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-aarch64.exe" + "sha256": "4acf95d3276cfbaea0e4c348f92f92ac792adc93566b166b5a5acef812a81439", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.40.1" + "version": "2.40.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 69a504bc6096d018e1cfa0968fa65ee0e095ee6a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 22 Oct 2025 16:06:07 -0700 Subject: [PATCH 538/667] Update 29-rc to compose 2.40.2 --- 29-rc/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index dd95d3688..15e12e4b3 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.40.1 +ENV DOCKER_COMPOSE_VERSION 2.40.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-x86_64'; \ - sha256='5bc26235e4de0be2aa350c13c33bd226d760d3b44cbd29820708788e02a2b6f2'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-x86_64'; \ + sha256='6c964d9655cd629ef43c5dc75d9612c2da319237debee54a7aef217e9f362b88'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv6'; \ - sha256='9b2cb71e4a5b4ca7a30d87fdaf21af33cb733f1e4b61b49084d03be0fe9f49ba'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv6'; \ + sha256='478c4ff43dc88726a222299a8f09402598978995b2c0cbcb5881e2d27930b1c4'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv7'; \ - sha256='a734e4a40041444262ef42accb8ff95f30cf63f24b1615593519aee7c5ec1d86'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv7'; \ + sha256='3760c19baf87386bfcee19f9ef40a948d86f6e89b1a101a06910e028ab5296f0'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-aarch64'; \ - sha256='ec4a385c4cd2afa4f5d429e6fe7dd6b2ae3dc251dc4e9332f1ad2cef8fa44554'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-aarch64'; \ + sha256='20e30dda8d0133895b7991bcfec1eb2c02f9d38c8de9e73669daf9fb83df49e6'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-ppc64le'; \ - sha256='07d116049fd92c3fe0c437471049307d2e37aa34ffaabced8f943e7fbb569c93'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-ppc64le'; \ + sha256='124996cdb350d8e53bb15bc31748d23c17f74001cab3615232da60ada683371e'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-riscv64'; \ - sha256='78886d10ad45bc5144835ce6ab9ef38a7bf43e709c9b0db002645ea7cfa458c0'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-riscv64'; \ + sha256='6f336a6bbc8cbe60da055ff9e1fc9c0cb698cecbfe52c3debd783103b3c4757b'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-s390x'; \ - sha256='634ce369c36d37faa9b454b01898de9709e8f34fd1cd263dcb3b548d0bc327a8'; \ + url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-s390x'; \ + sha256='0338a528d4a9d31b7b498ae0883f87f96bb4058b0a4e56d1b2e3ce12049b2bf6'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 000a68d2b..af7923f89 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e +ENV DOCKER_COMPOSE_VERSION 2.40.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index f20331632..66511c2cb 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e +ENV DOCKER_COMPOSE_VERSION 2.40.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index e233f0a1b..01bda533f 100644 --- a/versions.json +++ b/versions.json @@ -275,61 +275,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "5bc26235e4de0be2aa350c13c33bd226d760d3b44cbd29820708788e02a2b6f2", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-x86_64" + "sha256": "6c964d9655cd629ef43c5dc75d9612c2da319237debee54a7aef217e9f362b88", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "9b2cb71e4a5b4ca7a30d87fdaf21af33cb733f1e4b61b49084d03be0fe9f49ba", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv6" + "sha256": "478c4ff43dc88726a222299a8f09402598978995b2c0cbcb5881e2d27930b1c4", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "a734e4a40041444262ef42accb8ff95f30cf63f24b1615593519aee7c5ec1d86", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-armv7" + "sha256": "3760c19baf87386bfcee19f9ef40a948d86f6e89b1a101a06910e028ab5296f0", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "ec4a385c4cd2afa4f5d429e6fe7dd6b2ae3dc251dc4e9332f1ad2cef8fa44554", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-aarch64" + "sha256": "20e30dda8d0133895b7991bcfec1eb2c02f9d38c8de9e73669daf9fb83df49e6", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "436ef3c7faa58517466ea37268d5d558223df87ea43893db141984b87b4e5e16", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-darwin-x86_64" + "sha256": "f6b1a46b31647077a1b707f223ec80d21015d948c821338fec3477418b3d6f6c", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "127dfb1c730048594b0bc39a82407fc67e161f11b1bd2337d4c143e6e06fa4a7", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-darwin-aarch64" + "sha256": "cc3a8774fdadf65b53a12ef54b3e0e63f2267e1e843ebfa46c4976fc4f80b46b", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "07d116049fd92c3fe0c437471049307d2e37aa34ffaabced8f943e7fbb569c93", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-ppc64le" + "sha256": "124996cdb350d8e53bb15bc31748d23c17f74001cab3615232da60ada683371e", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "78886d10ad45bc5144835ce6ab9ef38a7bf43e709c9b0db002645ea7cfa458c0", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-riscv64" + "sha256": "6f336a6bbc8cbe60da055ff9e1fc9c0cb698cecbfe52c3debd783103b3c4757b", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "634ce369c36d37faa9b454b01898de9709e8f34fd1cd263dcb3b548d0bc327a8", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-linux-s390x" + "sha256": "0338a528d4a9d31b7b498ae0883f87f96bb4058b0a4e56d1b2e3ce12049b2bf6", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "bb701f3e71d27fd445581149a0d7f063df88e07b4038c80ba9c56d528e7c840e", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-x86_64.exe" + "sha256": "1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "75ddd3a2f0121efee3ac241e0f4f9f9c8b37d39a6f126a5d5d89d9909cb9001f", - "url": "https://github.com/docker/compose/releases/download/v2.40.1/docker-compose-windows-aarch64.exe" + "sha256": "4acf95d3276cfbaea0e4c348f92f92ac792adc93566b166b5a5acef812a81439", + "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-aarch64.exe" } }, - "version": "2.40.1" + "version": "2.40.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 1b231c4016afe59156bb992c5baab0f05d49dc77 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 30 Oct 2025 04:04:14 -0700 Subject: [PATCH 539/667] Update 28 to compose 2.40.3 --- 28/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index f18b4db92..59bd7ad5b 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.40.2 +ENV DOCKER_COMPOSE_VERSION 2.40.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-x86_64'; \ - sha256='6c964d9655cd629ef43c5dc75d9612c2da319237debee54a7aef217e9f362b88'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64'; \ + sha256='dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv6'; \ - sha256='478c4ff43dc88726a222299a8f09402598978995b2c0cbcb5881e2d27930b1c4'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6'; \ + sha256='cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv7'; \ - sha256='3760c19baf87386bfcee19f9ef40a948d86f6e89b1a101a06910e028ab5296f0'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7'; \ + sha256='66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-aarch64'; \ - sha256='20e30dda8d0133895b7991bcfec1eb2c02f9d38c8de9e73669daf9fb83df49e6'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64'; \ + sha256='d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-ppc64le'; \ - sha256='124996cdb350d8e53bb15bc31748d23c17f74001cab3615232da60ada683371e'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le'; \ + sha256='9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-riscv64'; \ - sha256='6f336a6bbc8cbe60da055ff9e1fc9c0cb698cecbfe52c3debd783103b3c4757b'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64'; \ + sha256='b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-s390x'; \ - sha256='0338a528d4a9d31b7b498ae0883f87f96bb4058b0a4e56d1b2e3ce12049b2bf6'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x'; \ + sha256='3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 64e005bcd..38b07a4f3 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d +ENV DOCKER_COMPOSE_VERSION 2.40.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index a291fab02..cd242ebf2 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d +ENV DOCKER_COMPOSE_VERSION 2.40.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 01bda533f..b61378561 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6c964d9655cd629ef43c5dc75d9612c2da319237debee54a7aef217e9f362b88", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-x86_64" + "sha256": "dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "478c4ff43dc88726a222299a8f09402598978995b2c0cbcb5881e2d27930b1c4", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv6" + "sha256": "cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "3760c19baf87386bfcee19f9ef40a948d86f6e89b1a101a06910e028ab5296f0", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv7" + "sha256": "66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "20e30dda8d0133895b7991bcfec1eb2c02f9d38c8de9e73669daf9fb83df49e6", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-aarch64" + "sha256": "d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "f6b1a46b31647077a1b707f223ec80d21015d948c821338fec3477418b3d6f6c", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-darwin-x86_64" + "sha256": "53528ecff0182546d92d7cc3f50dc78f9b387c3da68b4a3fd0cf2c48dab77133", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "cc3a8774fdadf65b53a12ef54b3e0e63f2267e1e843ebfa46c4976fc4f80b46b", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-darwin-aarch64" + "sha256": "8cd7eb5f95bacb536cc407111662e2c205d67d9abfea5dcb8400be8418db60d1", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "124996cdb350d8e53bb15bc31748d23c17f74001cab3615232da60ada683371e", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-ppc64le" + "sha256": "9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "6f336a6bbc8cbe60da055ff9e1fc9c0cb698cecbfe52c3debd783103b3c4757b", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-riscv64" + "sha256": "b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "0338a528d4a9d31b7b498ae0883f87f96bb4058b0a4e56d1b2e3ce12049b2bf6", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-s390x" + "sha256": "3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe" + "sha256": "4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "4acf95d3276cfbaea0e4c348f92f92ac792adc93566b166b5a5acef812a81439", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-aarch64.exe" + "sha256": "881a70b6d6e9ea1637746b0d5dbdaf83032b2f7952d4ee4b69f8f38b816909d1", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.40.2" + "version": "2.40.3" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From fb9f5dec4a56233429f642565a528d657376e296 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 30 Oct 2025 04:06:18 -0700 Subject: [PATCH 540/667] Update 29-rc to compose 2.40.3 --- 29-rc/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 15e12e4b3..34a3b1526 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.40.2 +ENV DOCKER_COMPOSE_VERSION 2.40.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-x86_64'; \ - sha256='6c964d9655cd629ef43c5dc75d9612c2da319237debee54a7aef217e9f362b88'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64'; \ + sha256='dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv6'; \ - sha256='478c4ff43dc88726a222299a8f09402598978995b2c0cbcb5881e2d27930b1c4'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6'; \ + sha256='cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv7'; \ - sha256='3760c19baf87386bfcee19f9ef40a948d86f6e89b1a101a06910e028ab5296f0'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7'; \ + sha256='66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-aarch64'; \ - sha256='20e30dda8d0133895b7991bcfec1eb2c02f9d38c8de9e73669daf9fb83df49e6'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64'; \ + sha256='d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-ppc64le'; \ - sha256='124996cdb350d8e53bb15bc31748d23c17f74001cab3615232da60ada683371e'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le'; \ + sha256='9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-riscv64'; \ - sha256='6f336a6bbc8cbe60da055ff9e1fc9c0cb698cecbfe52c3debd783103b3c4757b'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64'; \ + sha256='b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-s390x'; \ - sha256='0338a528d4a9d31b7b498ae0883f87f96bb4058b0a4e56d1b2e3ce12049b2bf6'; \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x'; \ + sha256='3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index af7923f89..82ab0297e 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d +ENV DOCKER_COMPOSE_VERSION 2.40.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 66511c2cb..34098a5c5 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d +ENV DOCKER_COMPOSE_VERSION 2.40.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b61378561..70f09a9b8 100644 --- a/versions.json +++ b/versions.json @@ -275,61 +275,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "6c964d9655cd629ef43c5dc75d9612c2da319237debee54a7aef217e9f362b88", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-x86_64" + "sha256": "dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "478c4ff43dc88726a222299a8f09402598978995b2c0cbcb5881e2d27930b1c4", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv6" + "sha256": "cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "3760c19baf87386bfcee19f9ef40a948d86f6e89b1a101a06910e028ab5296f0", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-armv7" + "sha256": "66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "20e30dda8d0133895b7991bcfec1eb2c02f9d38c8de9e73669daf9fb83df49e6", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-aarch64" + "sha256": "d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "f6b1a46b31647077a1b707f223ec80d21015d948c821338fec3477418b3d6f6c", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-darwin-x86_64" + "sha256": "53528ecff0182546d92d7cc3f50dc78f9b387c3da68b4a3fd0cf2c48dab77133", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "cc3a8774fdadf65b53a12ef54b3e0e63f2267e1e843ebfa46c4976fc4f80b46b", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-darwin-aarch64" + "sha256": "8cd7eb5f95bacb536cc407111662e2c205d67d9abfea5dcb8400be8418db60d1", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "124996cdb350d8e53bb15bc31748d23c17f74001cab3615232da60ada683371e", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-ppc64le" + "sha256": "9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "6f336a6bbc8cbe60da055ff9e1fc9c0cb698cecbfe52c3debd783103b3c4757b", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-riscv64" + "sha256": "b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "0338a528d4a9d31b7b498ae0883f87f96bb4058b0a4e56d1b2e3ce12049b2bf6", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-linux-s390x" + "sha256": "3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "1f7f20b91e0564147dc58b3a58a22a8f64a787e060ce3c25789f408beacc0c4d", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-x86_64.exe" + "sha256": "4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "4acf95d3276cfbaea0e4c348f92f92ac792adc93566b166b5a5acef812a81439", - "url": "https://github.com/docker/compose/releases/download/v2.40.2/docker-compose-windows-aarch64.exe" + "sha256": "881a70b6d6e9ea1637746b0d5dbdaf83032b2f7952d4ee4b69f8f38b816909d1", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-aarch64.exe" } }, - "version": "2.40.2" + "version": "2.40.3" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 30aaaecb3e69c151fd7af0e9f590c97c6196d4d3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 31 Oct 2025 16:04:27 -0700 Subject: [PATCH 541/667] Update 29-rc to 29.0.0-rc.2 --- 29-rc/cli/Dockerfile | 10 +++++----- 29-rc/dind-rootless/Dockerfile | 4 ++-- 29-rc/dind/Dockerfile | 8 ++++---- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- .../windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 34a3b1526..450bfdf93 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.0.0-rc.1 +ENV DOCKER_VERSION 29.0.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile index 85875ba82..61b0c1932 100644 --- a/29-rc/dind-rootless/Dockerfile +++ b/29-rc/dind-rootless/Dockerfile @@ -25,10 +25,10 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile index ec5478101..99829fce5 100644 --- a/29-rc/dind/Dockerfile +++ b/29-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 82ab0297e..1c4ffac2a 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/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 29.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.1.zip +ENV DOCKER_VERSION 29.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.2.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/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 34098a5c5..8a9d638a5 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/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 29.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.1.zip +ENV DOCKER_VERSION 29.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.2.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/versions.json b/versions.json index 70f09a9b8..56001a369 100644 --- a/versions.json +++ b/versions.json @@ -174,21 +174,21 @@ "29-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.2.zip" } }, "buildx": { @@ -339,6 +339,6 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.0.0-rc.1" + "version": "29.0.0-rc.2" } } From 8a57d8bada227253c19dc0b2f0943bd63fc791e5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 5 Nov 2025 08:38:44 -0800 Subject: [PATCH 542/667] Update 28 to 28.5.2 --- 28/cli/Dockerfile | 10 +++++----- 28/dind-rootless/Dockerfile | 4 ++-- 28/dind/Dockerfile | 8 ++++---- 28/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 28/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile index 59bd7ad5b..51f0c3f3f 100644 --- a/28/cli/Dockerfile +++ b/28/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 28.5.1 +ENV DOCKER_VERSION 28.5.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.5.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile index 309f643ca..86ccb2bb5 100644 --- a/28/dind-rootless/Dockerfile +++ b/28/dind-rootless/Dockerfile @@ -25,10 +25,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-28.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.5.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile index d9fa0d60e..1aac5be85 100644 --- a/28/dind/Dockerfile +++ b/28/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-28.5.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index 38b07a4f3..a4af989ef 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/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 28.5.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.1.zip +ENV DOCKER_VERSION 28.5.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.2.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/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index cd242ebf2..c4f35ac85 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/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 28.5.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.1.zip +ENV DOCKER_VERSION 28.5.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.2.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/versions.json b/versions.json index 56001a369..064fe7193 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "28": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.5.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.5.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.5.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.5.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.5.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.5.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.5.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.5.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.5.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.5.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.5.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.5.2.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "28.5.1" + "version": "28.5.2" }, "28-rc": null, "29": null, From 2ce33b8e582a4c379ca3af54ab2ef393eba0e7d9 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 6 Nov 2025 22:04:29 -0800 Subject: [PATCH 543/667] Update 29-rc to 29.0.0-rc.3 --- 29-rc/cli/Dockerfile | 10 +++++----- 29-rc/dind-rootless/Dockerfile | 4 ++-- 29-rc/dind/Dockerfile | 8 ++++---- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- .../windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 450bfdf93..158549398 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.0.0-rc.2 +ENV DOCKER_VERSION 29.0.0-rc.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile index 61b0c1932..ff2f07be8 100644 --- a/29-rc/dind-rootless/Dockerfile +++ b/29-rc/dind-rootless/Dockerfile @@ -25,10 +25,10 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile index 99829fce5..46bb80545 100644 --- a/29-rc/dind/Dockerfile +++ b/29-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.2.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 1c4ffac2a..483a42577 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/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 29.0.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.2.zip +ENV DOCKER_VERSION 29.0.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.3.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/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 8a9d638a5..86c561ccd 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/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 29.0.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.2.zip +ENV DOCKER_VERSION 29.0.0-rc.3 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.3.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/versions.json b/versions.json index 064fe7193..e385d614d 100644 --- a/versions.json +++ b/versions.json @@ -174,21 +174,21 @@ "29-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.2.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.3.zip" } }, "buildx": { @@ -339,6 +339,6 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.0.0-rc.2" + "version": "29.0.0-rc.3" } } From 319e58aa0299128924649f0745054a1b8732545a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 10 Nov 2025 16:04:24 -0800 Subject: [PATCH 544/667] Update 29 to 29.0.0, buildx 0.29.1, compose 2.40.3 --- 29/cli/Dockerfile | 167 ++++++++++++ 29/cli/docker-entrypoint.sh | 61 +++++ 29/cli/modprobe.sh | 20 ++ 29/dind-rootless/Dockerfile | 55 ++++ 29/dind/Dockerfile | 108 ++++++++ 29/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 171 ++++++++++++- 9 files changed, 1001 insertions(+), 1 deletion(-) create mode 100644 29/cli/Dockerfile create mode 100755 29/cli/docker-entrypoint.sh create mode 100755 29/cli/modprobe.sh create mode 100644 29/dind-rootless/Dockerfile create mode 100644 29/dind/Dockerfile create mode 100755 29/dind/dockerd-entrypoint.sh create mode 100644 29/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 29/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile new file mode 100644 index 000000000..f1fbdccb9 --- /dev/null +++ b/29/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.22 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 29.0.0 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.0.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.29.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64'; \ + sha256='7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6'; \ + sha256='37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7'; \ + sha256='ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64'; \ + sha256='50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le'; \ + sha256='04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64'; \ + sha256='f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x'; \ + sha256='3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.40.3 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64'; \ + sha256='dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6'; \ + sha256='cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7'; \ + sha256='66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64'; \ + sha256='d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le'; \ + sha256='9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64'; \ + sha256='b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x'; \ + sha256='3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/29/cli/docker-entrypoint.sh b/29/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/29/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/29/cli/modprobe.sh b/29/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/29/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile new file mode 100644 index 000000000..e7a797f79 --- /dev/null +++ b/29/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-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 +# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +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-29.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile new file mode 100644 index 000000000..755087f94 --- /dev/null +++ b/29/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.0.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.0.0.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.0.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.0.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:29-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/29/dind/dockerd-entrypoint.sh b/29/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..8a291dfa5 --- /dev/null +++ b/29/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..5b097b41d --- /dev/null +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.29.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.40.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..3fa626839 --- /dev/null +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.0.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.0.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.29.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.40.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index e385d614d..8140e38c2 100644 --- a/versions.json +++ b/versions.json @@ -170,7 +170,176 @@ "version": "28.5.2" }, "28-rc": null, - "29": null, + "29": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.0.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.0.0.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.0.0.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.0.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.0.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.0.0.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.29.1.linux-amd64", + "sha256": "7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.29.1.linux-arm-v6", + "sha256": "37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.29.1.linux-arm-v7", + "sha256": "ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.29.1.linux-arm64", + "sha256": "50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.29.1.freebsd-amd64", + "sha256": "80621ca4e7e447b66d71200454265590781809761c5baf195d8c21d274ebc97a", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.29.1.freebsd-arm64", + "sha256": "e2f8c835458143cba0c5628658517ed361138768f4f54196fd71c2e86bb42cd5", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.29.1.netbsd-amd64", + "sha256": "86c3973a56d6acd1f5aefcb88b9ed5d6215f79af57e368160e18cdcfbe1a1d59", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.29.1.netbsd-arm64", + "sha256": "c9346d24cc2051635bb3bc656869aa64a584f80a284d3f7a3d44802f26d57595", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.29.1.openbsd-amd64", + "sha256": "9a7bbc02ba0897a64ae5674630c74b4d2539176d903a6f9c26209b03591f69d6", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.29.1.openbsd-arm64", + "sha256": "810ea3aa794fb5e91d3fd860a14201ac6308499328ae6c461e2e0879662eca8e", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.29.1.linux-ppc64le", + "sha256": "04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.29.1.linux-riscv64", + "sha256": "f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.29.1.linux-s390x", + "sha256": "3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.29.1.windows-amd64.exe", + "sha256": "3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.29.1.windows-arm64.exe", + "sha256": "2e1e5a3603ef9c92cef386ea8a6ffc300854247737686c6e9af47c308dec19c8", + "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-arm64.exe" + } + }, + "version": "0.29.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "53528ecff0182546d92d7cc3f50dc78f9b387c3da68b4a3fd0cf2c48dab77133", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "8cd7eb5f95bacb536cc407111662e2c205d67d9abfea5dcb8400be8418db60d1", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "881a70b6d6e9ea1637746b0d5dbdaf83032b2f7952d4ee4b69f8f38b816909d1", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.40.3" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "29.0.0" + }, "29-rc": { "arches": { "amd64": { From 3648a8eb07dc02f8f6db6c8bed0aeafe0bb9a816 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 10 Nov 2025 16:06:24 -0800 Subject: [PATCH 545/667] Update 29-rc --- 29-rc/cli/Dockerfile | 167 ------------ 29-rc/cli/docker-entrypoint.sh | 61 ----- 29-rc/cli/modprobe.sh | 20 -- 29-rc/dind-rootless/Dockerfile | 55 ---- 29-rc/dind/Dockerfile | 108 -------- 29-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 171 +------------ 9 files changed, 1 insertion(+), 1001 deletions(-) delete mode 100644 29-rc/cli/Dockerfile delete mode 100755 29-rc/cli/docker-entrypoint.sh delete mode 100755 29-rc/cli/modprobe.sh delete mode 100644 29-rc/dind-rootless/Dockerfile delete mode 100644 29-rc/dind/Dockerfile delete mode 100755 29-rc/dind/dockerd-entrypoint.sh delete mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile deleted file mode 100644 index 158549398..000000000 --- a/29-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.22 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 29.0.0-rc.3 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.3.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.3.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.29.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64'; \ - sha256='7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6'; \ - sha256='37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7'; \ - sha256='ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64'; \ - sha256='50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le'; \ - sha256='04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64'; \ - sha256='f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x'; \ - sha256='3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.40.3 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64'; \ - sha256='dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6'; \ - sha256='cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7'; \ - sha256='66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64'; \ - sha256='d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le'; \ - sha256='9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64'; \ - sha256='b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x'; \ - sha256='3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/29-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/29-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile deleted file mode 100644 index ff2f07be8..000000000 --- a/29-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-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 -# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile deleted file mode 100644 index 46bb80545..000000000 --- a/29-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.3.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.3.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.3.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.3.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 8a291dfa5..000000000 --- a/29-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 483a42577..000000000 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.0.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.3.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.29.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index 86c561ccd..000000000 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.0.0-rc.3 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.3.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.29.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 8140e38c2..2f524a38d 100644 --- a/versions.json +++ b/versions.json @@ -340,174 +340,5 @@ ], "version": "29.0.0" }, - "29-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.0.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.0.0-rc.3.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.0.0-rc.3.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.0.0-rc.3.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.0.0-rc.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.0.0-rc.3.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.0.0-rc.3.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.29.1.linux-amd64", - "sha256": "7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.29.1.linux-arm-v6", - "sha256": "37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.29.1.linux-arm-v7", - "sha256": "ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.29.1.linux-arm64", - "sha256": "50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.29.1.freebsd-amd64", - "sha256": "80621ca4e7e447b66d71200454265590781809761c5baf195d8c21d274ebc97a", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.29.1.freebsd-arm64", - "sha256": "e2f8c835458143cba0c5628658517ed361138768f4f54196fd71c2e86bb42cd5", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.29.1.netbsd-amd64", - "sha256": "86c3973a56d6acd1f5aefcb88b9ed5d6215f79af57e368160e18cdcfbe1a1d59", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.29.1.netbsd-arm64", - "sha256": "c9346d24cc2051635bb3bc656869aa64a584f80a284d3f7a3d44802f26d57595", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.29.1.openbsd-amd64", - "sha256": "9a7bbc02ba0897a64ae5674630c74b4d2539176d903a6f9c26209b03591f69d6", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.29.1.openbsd-arm64", - "sha256": "810ea3aa794fb5e91d3fd860a14201ac6308499328ae6c461e2e0879662eca8e", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.29.1.linux-ppc64le", - "sha256": "04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.29.1.linux-riscv64", - "sha256": "f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.29.1.linux-s390x", - "sha256": "3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.29.1.windows-amd64.exe", - "sha256": "3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.29.1.windows-arm64.exe", - "sha256": "2e1e5a3603ef9c92cef386ea8a6ffc300854247737686c6e9af47c308dec19c8", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-arm64.exe" - } - }, - "version": "0.29.1" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "53528ecff0182546d92d7cc3f50dc78f9b387c3da68b4a3fd0cf2c48dab77133", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "8cd7eb5f95bacb536cc407111662e2c205d67d9abfea5dcb8400be8418db60d1", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "881a70b6d6e9ea1637746b0d5dbdaf83032b2f7952d4ee4b69f8f38b816909d1", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.40.3" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "29.0.0-rc.3" - } + "29-rc": null } From 3e3f724002810a597ecb7a54eb86c4d1b81ffb04 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Mon, 10 Nov 2025 16:27:39 -0800 Subject: [PATCH 546/667] Drop 28.x (now EOL) --- 28/cli/Dockerfile | 167 ------------ 28/cli/docker-entrypoint.sh | 61 ----- 28/cli/modprobe.sh | 20 -- 28/dind-rootless/Dockerfile | 55 ---- 28/dind/Dockerfile | 108 -------- 28/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 171 ------------- 9 files changed, 1002 deletions(-) delete mode 100644 28/cli/Dockerfile delete mode 100755 28/cli/docker-entrypoint.sh delete mode 100755 28/cli/modprobe.sh delete mode 100644 28/dind-rootless/Dockerfile delete mode 100644 28/dind/Dockerfile delete mode 100755 28/dind/dockerd-entrypoint.sh delete mode 100644 28/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 28/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/28/cli/Dockerfile b/28/cli/Dockerfile deleted file mode 100644 index 51f0c3f3f..000000000 --- a/28/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.22 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 28.5.2 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.5.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.29.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64'; \ - sha256='7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6'; \ - sha256='37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7'; \ - sha256='ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64'; \ - sha256='50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le'; \ - sha256='04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64'; \ - sha256='f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x'; \ - sha256='3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.40.3 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64'; \ - sha256='dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6'; \ - sha256='cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7'; \ - sha256='66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64'; \ - sha256='d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le'; \ - sha256='9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64'; \ - sha256='b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x'; \ - sha256='3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/28/cli/docker-entrypoint.sh b/28/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/28/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/28/cli/modprobe.sh b/28/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/28/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/28/dind-rootless/Dockerfile b/28/dind-rootless/Dockerfile deleted file mode 100644 index 86ccb2bb5..000000000 --- a/28/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-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 -# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -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-28.5.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/28/dind/Dockerfile b/28/dind/Dockerfile deleted file mode 100644 index 1aac5be85..000000000 --- a/28/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:28-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-28.5.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-28.5.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-28.5.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-28.5.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:28-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/28/dind/dockerd-entrypoint.sh b/28/dind/dockerd-entrypoint.sh deleted file mode 100755 index 8a291dfa5..000000000 --- a/28/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index a4af989ef..000000000 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.5.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.29.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index c4f35ac85..000000000 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 28.5.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.5.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.29.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 2f524a38d..b93167755 100644 --- a/versions.json +++ b/versions.json @@ -1,175 +1,4 @@ { - "28": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-28.5.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.5.2.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-28.5.2.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-28.5.2.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-28.5.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.5.2.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-28.5.2.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.29.1.linux-amd64", - "sha256": "7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.29.1.linux-arm-v6", - "sha256": "37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.29.1.linux-arm-v7", - "sha256": "ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.29.1.linux-arm64", - "sha256": "50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.29.1.freebsd-amd64", - "sha256": "80621ca4e7e447b66d71200454265590781809761c5baf195d8c21d274ebc97a", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.29.1.freebsd-arm64", - "sha256": "e2f8c835458143cba0c5628658517ed361138768f4f54196fd71c2e86bb42cd5", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.29.1.netbsd-amd64", - "sha256": "86c3973a56d6acd1f5aefcb88b9ed5d6215f79af57e368160e18cdcfbe1a1d59", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.29.1.netbsd-arm64", - "sha256": "c9346d24cc2051635bb3bc656869aa64a584f80a284d3f7a3d44802f26d57595", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.29.1.openbsd-amd64", - "sha256": "9a7bbc02ba0897a64ae5674630c74b4d2539176d903a6f9c26209b03591f69d6", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.29.1.openbsd-arm64", - "sha256": "810ea3aa794fb5e91d3fd860a14201ac6308499328ae6c461e2e0879662eca8e", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.29.1.linux-ppc64le", - "sha256": "04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.29.1.linux-riscv64", - "sha256": "f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.29.1.linux-s390x", - "sha256": "3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.29.1.windows-amd64.exe", - "sha256": "3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.29.1.windows-arm64.exe", - "sha256": "2e1e5a3603ef9c92cef386ea8a6ffc300854247737686c6e9af47c308dec19c8", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-arm64.exe" - } - }, - "version": "0.29.1" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "53528ecff0182546d92d7cc3f50dc78f9b387c3da68b4a3fd0cf2c48dab77133", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "8cd7eb5f95bacb536cc407111662e2c205d67d9abfea5dcb8400be8418db60d1", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "881a70b6d6e9ea1637746b0d5dbdaf83032b2f7952d4ee4b69f8f38b816909d1", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.40.3" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "28.5.2" - }, - "28-rc": null, "29": { "arches": { "amd64": { From 3ffcb03281699d93d9cfa81f8b23a15b3926b06c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 12 Nov 2025 16:04:14 -0800 Subject: [PATCH 547/667] Update 29 to buildx 0.30.0 --- 29/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index f1fbdccb9..c5e18ff5a 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.29.1 +ENV DOCKER_BUILDX_VERSION 0.30.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64'; \ - sha256='7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-amd64'; \ + sha256='460680948a25b80e62ffe085cd2d7ef4088540f3f3f58734b445a31534198240'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6'; \ - sha256='37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm-v6'; \ + sha256='bb50ae022407e185f9e77b5e8fec7b4460c3dab5b2f2007f74fa2d8f6b9296a5'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7'; \ - sha256='ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm-v7'; \ + sha256='d2a1b9a7b05d86b9f3b0b593edc2489b94ac9d27005966718374cd34cb840067'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64'; \ - sha256='50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm64'; \ + sha256='f8e060a1a1e659d1c919d440652775320e8c2998b051eb4b5845bfcee9d85696'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le'; \ - sha256='04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-ppc64le'; \ + sha256='1ad8ca464fdd5883c8b9c51294f21dac58f40acfab215371a35716c5aa1f78ee'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64'; \ - sha256='f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-riscv64'; \ + sha256='d0dcc7eda556022d03403af24d8044fcefb7daf5ddb7a11f9c154800919bfa2f'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x'; \ - sha256='3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-s390x'; \ + sha256='42f9615e3f812b4cbcec147923229ef7e404b7fe6107e10f196c7d10cdcac978'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 5b097b41d..f18e2240e 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.29.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 +ENV DOCKER_BUILDX_VERSION 0.30.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 616ddbe97ab40946ee736f0adb6c8ee58328742086af06823d2491ddae6c22ae RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 3fa626839..8620c391f 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.29.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784 +ENV DOCKER_BUILDX_VERSION 0.30.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 616ddbe97ab40946ee736f0adb6c8ee58328742086af06823d2491ddae6c22ae RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b93167755..4b3c9eac0 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.29.1.linux-amd64", - "sha256": "7d2d7d6d4680aa349614965aaa33ccec43f1a9a21e908a5ce4cb6adfa5ad5141", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-amd64" + "file": "buildx-v0.30.0.linux-amd64", + "sha256": "460680948a25b80e62ffe085cd2d7ef4088540f3f3f58734b445a31534198240", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.29.1.linux-arm-v6", - "sha256": "37d0aeef65766de8e1d053210fb1f062e01a44c34a65a118a7e7942cbbf68cab", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v6" + "file": "buildx-v0.30.0.linux-arm-v6", + "sha256": "bb50ae022407e185f9e77b5e8fec7b4460c3dab5b2f2007f74fa2d8f6b9296a5", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.29.1.linux-arm-v7", - "sha256": "ba46e94d7420b4b05ff02109f5f8a937a86a620a660898ff15fb987022f62588", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm-v7" + "file": "buildx-v0.30.0.linux-arm-v7", + "sha256": "d2a1b9a7b05d86b9f3b0b593edc2489b94ac9d27005966718374cd34cb840067", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.29.1.linux-arm64", - "sha256": "50e85c4e290b698908421161c1aee069bcc5d4a65b7b7201bfac3a176b223a7e", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-arm64" + "file": "buildx-v0.30.0.linux-arm64", + "sha256": "f8e060a1a1e659d1c919d440652775320e8c2998b051eb4b5845bfcee9d85696", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.29.1.freebsd-amd64", - "sha256": "80621ca4e7e447b66d71200454265590781809761c5baf195d8c21d274ebc97a", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-amd64" + "file": "buildx-v0.30.0.freebsd-amd64", + "sha256": "8425d803a862be496cefbcfb3d34c400620ae188ab8f615c65360f5eee307997", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.29.1.freebsd-arm64", - "sha256": "e2f8c835458143cba0c5628658517ed361138768f4f54196fd71c2e86bb42cd5", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.freebsd-arm64" + "file": "buildx-v0.30.0.freebsd-arm64", + "sha256": "9b237a132c03186c4df3294968b4e18314ff5851f6c4f1f3e78a7a282b2970fd", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.29.1.netbsd-amd64", - "sha256": "86c3973a56d6acd1f5aefcb88b9ed5d6215f79af57e368160e18cdcfbe1a1d59", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-amd64" + "file": "buildx-v0.30.0.netbsd-amd64", + "sha256": "ffc70c75b262981310407773cba39ef1a7368bf4eae1dbb7c2f9a459cc0829b8", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.29.1.netbsd-arm64", - "sha256": "c9346d24cc2051635bb3bc656869aa64a584f80a284d3f7a3d44802f26d57595", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.netbsd-arm64" + "file": "buildx-v0.30.0.netbsd-arm64", + "sha256": "170283412bc352197a3120c03ba47e1e085923cfe38aabdb620cd12654bb1686", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.29.1.openbsd-amd64", - "sha256": "9a7bbc02ba0897a64ae5674630c74b4d2539176d903a6f9c26209b03591f69d6", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-amd64" + "file": "buildx-v0.30.0.openbsd-amd64", + "sha256": "b821782c4cafbe0dc5ecb60f48535b664f66547af92691c1acdd06ea66776c2c", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.29.1.openbsd-arm64", - "sha256": "810ea3aa794fb5e91d3fd860a14201ac6308499328ae6c461e2e0879662eca8e", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.openbsd-arm64" + "file": "buildx-v0.30.0.openbsd-arm64", + "sha256": "e4a96cf04dbfe51b04de3eb8066ae27bf90a973d085ab798a01a280a8af90534", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.29.1.linux-ppc64le", - "sha256": "04e9b85273502f5c673f2216f64fe336045b6d196ba7e0350a11d6af5dcaee3a", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-ppc64le" + "file": "buildx-v0.30.0.linux-ppc64le", + "sha256": "1ad8ca464fdd5883c8b9c51294f21dac58f40acfab215371a35716c5aa1f78ee", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.29.1.linux-riscv64", - "sha256": "f4f2d5bd103b8bba725b3b0ef14e9a4a799e0806d5076045e399e221a3bbb723", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-riscv64" + "file": "buildx-v0.30.0.linux-riscv64", + "sha256": "d0dcc7eda556022d03403af24d8044fcefb7daf5ddb7a11f9c154800919bfa2f", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.29.1.linux-s390x", - "sha256": "3b5caf470972c286642112df47b2251d2a5d412aa150d78d74db20a3409d9f23", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.linux-s390x" + "file": "buildx-v0.30.0.linux-s390x", + "sha256": "42f9615e3f812b4cbcec147923229ef7e404b7fe6107e10f196c7d10cdcac978", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.29.1.windows-amd64.exe", - "sha256": "3522d12875b71093a210fdc717c9b4be915d1617d41dd347e6dc3e7f2b99d784", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-amd64.exe" + "file": "buildx-v0.30.0.windows-amd64.exe", + "sha256": "616ddbe97ab40946ee736f0adb6c8ee58328742086af06823d2491ddae6c22ae", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.29.1.windows-arm64.exe", - "sha256": "2e1e5a3603ef9c92cef386ea8a6ffc300854247737686c6e9af47c308dec19c8", - "url": "https://github.com/docker/buildx/releases/download/v0.29.1/buildx-v0.29.1.windows-arm64.exe" + "file": "buildx-v0.30.0.windows-arm64.exe", + "sha256": "98d1af3972b9c85a814693d937270828d61879504f4115be1a921b7f2657a591", + "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.windows-arm64.exe" } }, - "version": "0.29.1" + "version": "0.30.0" }, "compose": { "arches": { From 7de4047a624d72cb5b9042cb4be6faefd94267da Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 14 Nov 2025 09:23:54 -0800 Subject: [PATCH 548/667] Update 29 to 29.0.1 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index c5e18ff5a..94e8b5861 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.0.0 +ENV DOCKER_VERSION 29.0.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index e7a797f79..72ffba7b0 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 755087f94..bbd9982c6 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.0.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index f18e2240e..4b8c82d4e 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.0.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.0.zip +ENV DOCKER_VERSION 29.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.1.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 8620c391f..833bd04a8 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.0.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.0.zip +ENV DOCKER_VERSION 29.0.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.1.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/versions.json b/versions.json index 4b3c9eac0..ac9e14293 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.0.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.0.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.0.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.0.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.0.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.0.1.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.0.0" + "version": "29.0.1" }, "29-rc": null } From 2828af4bf009faf210f6e490b95fe5c2e0b3a9fb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 17 Nov 2025 09:23:24 -0800 Subject: [PATCH 549/667] Update 29 to 29.0.2 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 94e8b5861..66d349481 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.0.1 +ENV DOCKER_VERSION 29.0.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 72ffba7b0..dfa78b25e 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index bbd9982c6..3d5526480 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.0.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 4b8c82d4e..94a734ce8 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.1.zip +ENV DOCKER_VERSION 29.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.2.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 833bd04a8..e44d5922b 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.0.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.1.zip +ENV DOCKER_VERSION 29.0.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.2.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/versions.json b/versions.json index ac9e14293..902a46255 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.0.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.0.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.0.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.0.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.0.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.0.2.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.0.1" + "version": "29.0.2" }, "29-rc": null } From ccfa050d44f38c63e1cfae4d3c26345ae2f6dde2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 17 Nov 2025 10:04:13 -0800 Subject: [PATCH 550/667] Update 29 to buildx 0.30.1 --- 29/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 66d349481..a0c264544 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.30.0 +ENV DOCKER_BUILDX_VERSION 0.30.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-amd64'; \ - sha256='460680948a25b80e62ffe085cd2d7ef4088540f3f3f58734b445a31534198240'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64'; \ + sha256='c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm-v6'; \ - sha256='bb50ae022407e185f9e77b5e8fec7b4460c3dab5b2f2007f74fa2d8f6b9296a5'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6'; \ + sha256='348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm-v7'; \ - sha256='d2a1b9a7b05d86b9f3b0b593edc2489b94ac9d27005966718374cd34cb840067'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7'; \ + sha256='32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm64'; \ - sha256='f8e060a1a1e659d1c919d440652775320e8c2998b051eb4b5845bfcee9d85696'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64'; \ + sha256='31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-ppc64le'; \ - sha256='1ad8ca464fdd5883c8b9c51294f21dac58f40acfab215371a35716c5aa1f78ee'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le'; \ + sha256='13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-riscv64'; \ - sha256='d0dcc7eda556022d03403af24d8044fcefb7daf5ddb7a11f9c154800919bfa2f'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64'; \ + sha256='86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-s390x'; \ - sha256='42f9615e3f812b4cbcec147923229ef7e404b7fe6107e10f196c7d10cdcac978'; \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x'; \ + sha256='b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 94a734ce8..cad4e8d69 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.30.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 616ddbe97ab40946ee736f0adb6c8ee58328742086af06823d2491ddae6c22ae +ENV DOCKER_BUILDX_VERSION 0.30.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index e44d5922b..d518fbe52 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.30.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 616ddbe97ab40946ee736f0adb6c8ee58328742086af06823d2491ddae6c22ae +ENV DOCKER_BUILDX_VERSION 0.30.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 902a46255..15e9ab1ea 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.30.0.linux-amd64", - "sha256": "460680948a25b80e62ffe085cd2d7ef4088540f3f3f58734b445a31534198240", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-amd64" + "file": "buildx-v0.30.1.linux-amd64", + "sha256": "c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.30.0.linux-arm-v6", - "sha256": "bb50ae022407e185f9e77b5e8fec7b4460c3dab5b2f2007f74fa2d8f6b9296a5", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm-v6" + "file": "buildx-v0.30.1.linux-arm-v6", + "sha256": "348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.30.0.linux-arm-v7", - "sha256": "d2a1b9a7b05d86b9f3b0b593edc2489b94ac9d27005966718374cd34cb840067", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm-v7" + "file": "buildx-v0.30.1.linux-arm-v7", + "sha256": "32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.30.0.linux-arm64", - "sha256": "f8e060a1a1e659d1c919d440652775320e8c2998b051eb4b5845bfcee9d85696", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-arm64" + "file": "buildx-v0.30.1.linux-arm64", + "sha256": "31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.30.0.freebsd-amd64", - "sha256": "8425d803a862be496cefbcfb3d34c400620ae188ab8f615c65360f5eee307997", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.freebsd-amd64" + "file": "buildx-v0.30.1.freebsd-amd64", + "sha256": "a5e3b8ebb9e1eec8db470dfe8e9a02971bc76c7f7152310247ff619645335b2c", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.30.0.freebsd-arm64", - "sha256": "9b237a132c03186c4df3294968b4e18314ff5851f6c4f1f3e78a7a282b2970fd", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.freebsd-arm64" + "file": "buildx-v0.30.1.freebsd-arm64", + "sha256": "e2665c6eab1dfe3c7294a7799370a26469c170761bf30f6c28b9858c529deb0c", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.30.0.netbsd-amd64", - "sha256": "ffc70c75b262981310407773cba39ef1a7368bf4eae1dbb7c2f9a459cc0829b8", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.netbsd-amd64" + "file": "buildx-v0.30.1.netbsd-amd64", + "sha256": "94e3c850a2593cbf5d18b87caf6b28063048b00f86f5c7991e6ca3b95eb78af8", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.30.0.netbsd-arm64", - "sha256": "170283412bc352197a3120c03ba47e1e085923cfe38aabdb620cd12654bb1686", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.netbsd-arm64" + "file": "buildx-v0.30.1.netbsd-arm64", + "sha256": "495b84d03440cd5494de87b21a8f109d4924ed3191975bf335f0520c77beee55", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.30.0.openbsd-amd64", - "sha256": "b821782c4cafbe0dc5ecb60f48535b664f66547af92691c1acdd06ea66776c2c", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.openbsd-amd64" + "file": "buildx-v0.30.1.openbsd-amd64", + "sha256": "65f26756f30e0d5f1d6dc93cf4f870fb84811d2728585ff27d7fb77c0c8facd5", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.30.0.openbsd-arm64", - "sha256": "e4a96cf04dbfe51b04de3eb8066ae27bf90a973d085ab798a01a280a8af90534", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.openbsd-arm64" + "file": "buildx-v0.30.1.openbsd-arm64", + "sha256": "a63c1fb292f0d79a9bc11880d13270a3cdbcb5fd50fc8cbf8ce3d558ce91bdec", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.30.0.linux-ppc64le", - "sha256": "1ad8ca464fdd5883c8b9c51294f21dac58f40acfab215371a35716c5aa1f78ee", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-ppc64le" + "file": "buildx-v0.30.1.linux-ppc64le", + "sha256": "13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.30.0.linux-riscv64", - "sha256": "d0dcc7eda556022d03403af24d8044fcefb7daf5ddb7a11f9c154800919bfa2f", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-riscv64" + "file": "buildx-v0.30.1.linux-riscv64", + "sha256": "86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.30.0.linux-s390x", - "sha256": "42f9615e3f812b4cbcec147923229ef7e404b7fe6107e10f196c7d10cdcac978", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.linux-s390x" + "file": "buildx-v0.30.1.linux-s390x", + "sha256": "b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.30.0.windows-amd64.exe", - "sha256": "616ddbe97ab40946ee736f0adb6c8ee58328742086af06823d2491ddae6c22ae", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.windows-amd64.exe" + "file": "buildx-v0.30.1.windows-amd64.exe", + "sha256": "3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.30.0.windows-arm64.exe", - "sha256": "98d1af3972b9c85a814693d937270828d61879504f4115be1a921b7f2657a591", - "url": "https://github.com/docker/buildx/releases/download/v0.30.0/buildx-v0.30.0.windows-arm64.exe" + "file": "buildx-v0.30.1.windows-arm64.exe", + "sha256": "a5270fa6b53604cdc510300e9752e1e15afdfba7b2cea2aea5b6d4b609034e74", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-arm64.exe" } }, - "version": "0.30.0" + "version": "0.30.1" }, "compose": { "arches": { From 64aaac0dbd8bff5ba44c56e47a7e1576e5f34b51 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 17 Nov 2025 16:04:22 -0800 Subject: [PATCH 551/667] Update 29-rc to 29.1.0-rc.1, buildx 0.30.1, compose 2.40.3 --- 29-rc/cli/Dockerfile | 167 ++++++++++++ 29-rc/cli/docker-entrypoint.sh | 61 +++++ 29-rc/cli/modprobe.sh | 20 ++ 29-rc/dind-rootless/Dockerfile | 55 ++++ 29-rc/dind/Dockerfile | 108 ++++++++ 29-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 171 ++++++++++++- 9 files changed, 1001 insertions(+), 1 deletion(-) create mode 100644 29-rc/cli/Dockerfile create mode 100755 29-rc/cli/docker-entrypoint.sh create mode 100755 29-rc/cli/modprobe.sh create mode 100644 29-rc/dind-rootless/Dockerfile create mode 100644 29-rc/dind/Dockerfile create mode 100755 29-rc/dind/dockerd-entrypoint.sh create mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile new file mode 100644 index 000000000..7038bc9df --- /dev/null +++ b/29-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.22 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 29.1.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.1.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.1.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.1.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.1.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.30.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64'; \ + sha256='c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6'; \ + sha256='348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7'; \ + sha256='32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64'; \ + sha256='31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le'; \ + sha256='13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64'; \ + sha256='86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x'; \ + sha256='b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 2.40.3 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64'; \ + sha256='dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6'; \ + sha256='cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7'; \ + sha256='66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64'; \ + sha256='d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le'; \ + sha256='9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64'; \ + sha256='b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x'; \ + sha256='3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/29-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/29-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..d0f960693 --- /dev/null +++ b/29-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-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 +# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.1.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.1.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile new file mode 100644 index 000000000..61104d661 --- /dev/null +++ b/29-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.1.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.1.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.1.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.1.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..8a291dfa5 --- /dev/null +++ b/29-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..6b9885275 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.1.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.1.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.30.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.40.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..a2ab0542e --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.1.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.1.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.30.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 2.40.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 15e9ab1ea..a4d19534b 100644 --- a/versions.json +++ b/versions.json @@ -169,5 +169,174 @@ ], "version": "29.0.2" }, - "29-rc": null + "29-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.1.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.1.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.1.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.1.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.1.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.1.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.1.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.30.1.linux-amd64", + "sha256": "c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.30.1.linux-arm-v6", + "sha256": "348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.30.1.linux-arm-v7", + "sha256": "32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.30.1.linux-arm64", + "sha256": "31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.30.1.freebsd-amd64", + "sha256": "a5e3b8ebb9e1eec8db470dfe8e9a02971bc76c7f7152310247ff619645335b2c", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.30.1.freebsd-arm64", + "sha256": "e2665c6eab1dfe3c7294a7799370a26469c170761bf30f6c28b9858c529deb0c", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.30.1.netbsd-amd64", + "sha256": "94e3c850a2593cbf5d18b87caf6b28063048b00f86f5c7991e6ca3b95eb78af8", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.30.1.netbsd-arm64", + "sha256": "495b84d03440cd5494de87b21a8f109d4924ed3191975bf335f0520c77beee55", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.30.1.openbsd-amd64", + "sha256": "65f26756f30e0d5f1d6dc93cf4f870fb84811d2728585ff27d7fb77c0c8facd5", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.30.1.openbsd-arm64", + "sha256": "a63c1fb292f0d79a9bc11880d13270a3cdbcb5fd50fc8cbf8ce3d558ce91bdec", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.30.1.linux-ppc64le", + "sha256": "13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.30.1.linux-riscv64", + "sha256": "86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.30.1.linux-s390x", + "sha256": "b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.30.1.windows-amd64.exe", + "sha256": "3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.30.1.windows-arm64.exe", + "sha256": "a5270fa6b53604cdc510300e9752e1e15afdfba7b2cea2aea5b6d4b609034e74", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-arm64.exe" + } + }, + "version": "0.30.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "53528ecff0182546d92d7cc3f50dc78f9b387c3da68b4a3fd0cf2c48dab77133", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "8cd7eb5f95bacb536cc407111662e2c205d67d9abfea5dcb8400be8418db60d1", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "881a70b6d6e9ea1637746b0d5dbdaf83032b2f7952d4ee4b69f8f38b816909d1", + "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-aarch64.exe" + } + }, + "version": "2.40.3" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "29.1.0-rc.1" + } } From 873f19768fd792a879123ed460dc082c30aa3d7d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 24 Nov 2025 04:04:13 -0800 Subject: [PATCH 552/667] Update 29 to 29.0.3 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index a0c264544..131a90881 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.0.2 +ENV DOCKER_VERSION 29.0.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.0.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index dfa78b25e..fdb69b71a 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 3d5526480..5eff7936d 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.0.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index cad4e8d69..5d10952d6 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.2.zip +ENV DOCKER_VERSION 29.0.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.3.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index d518fbe52..19c8304fa 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.0.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.2.zip +ENV DOCKER_VERSION 29.0.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.3.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/versions.json b/versions.json index a4d19534b..a471b8871 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.0.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.0.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.0.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.0.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.0.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.0.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.0.3.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.0.2" + "version": "29.0.3" }, "29-rc": { "arches": { From e3144ea7f1c552b2b2ad33cf9b2743705509d9d3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 24 Nov 2025 16:04:13 -0800 Subject: [PATCH 553/667] Update 29 to 29.0.4 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 131a90881..cc213a230 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.0.3 +ENV DOCKER_VERSION 29.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-29.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.0.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index fdb69b71a..5db3d2956 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 5eff7936d..f5f414b8d 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.0.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 5d10952d6..12d076c39 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.0.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.3.zip +ENV DOCKER_VERSION 29.0.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 19c8304fa..beb7dab3b 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.0.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.3.zip +ENV DOCKER_VERSION 29.0.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.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/versions.json b/versions.json index a471b8871..0fa01cf6e 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.0.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.0.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.4.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.0.4.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.0.4.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.0.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.0.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.4.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.0.3.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.0.4.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.0.3" + "version": "29.0.4" }, "29-rc": { "arches": { From 263fbd19c75006de33a9d55204ee84c03486953a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 27 Nov 2025 10:04:13 -0800 Subject: [PATCH 554/667] Update 29 to 29.1.0 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index cc213a230..bae63c924 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.0.4 +ENV DOCKER_VERSION 29.1.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 5db3d2956..795e099f9 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index f5f414b8d..061057e61 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.0.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 12d076c39..882b3bd09 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.0.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.4.zip +ENV DOCKER_VERSION 29.1.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.0.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index beb7dab3b..d06a22512 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.0.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.0.4.zip +ENV DOCKER_VERSION 29.1.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.0.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/versions.json b/versions.json index 0fa01cf6e..b409da4ae 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.0.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.0.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.0.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.0.4.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.0.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.0.4" + "version": "29.1.0" }, "29-rc": { "arches": { From a36f3f042a8f479da6f15b83c528747b92c2c1fe Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 27 Nov 2025 10:06:05 -0800 Subject: [PATCH 555/667] Update 29-rc --- 29-rc/cli/Dockerfile | 167 ------------ 29-rc/cli/docker-entrypoint.sh | 61 ----- 29-rc/cli/modprobe.sh | 20 -- 29-rc/dind-rootless/Dockerfile | 55 ---- 29-rc/dind/Dockerfile | 108 -------- 29-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 171 +------------ 9 files changed, 1 insertion(+), 1001 deletions(-) delete mode 100644 29-rc/cli/Dockerfile delete mode 100755 29-rc/cli/docker-entrypoint.sh delete mode 100755 29-rc/cli/modprobe.sh delete mode 100644 29-rc/dind-rootless/Dockerfile delete mode 100644 29-rc/dind/Dockerfile delete mode 100755 29-rc/dind/dockerd-entrypoint.sh delete mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile deleted file mode 100644 index 7038bc9df..000000000 --- a/29-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.22 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 29.1.0-rc.1 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.1.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.1.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.1.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.1.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.30.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64'; \ - sha256='c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6'; \ - sha256='348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7'; \ - sha256='32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64'; \ - sha256='31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le'; \ - sha256='13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64'; \ - sha256='86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x'; \ - sha256='b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 2.40.3 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64'; \ - sha256='dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6'; \ - sha256='cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7'; \ - sha256='66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64'; \ - sha256='d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le'; \ - sha256='9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64'; \ - sha256='b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x'; \ - sha256='3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/29-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/29-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile deleted file mode 100644 index d0f960693..000000000 --- a/29-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-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 -# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.1.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.1.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile deleted file mode 100644 index 61104d661..000000000 --- a/29-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.1.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.1.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.1.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.1.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 8a291dfa5..000000000 --- a/29-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 6b9885275..000000000 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.1.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.1.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.30.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index a2ab0542e..000000000 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.1.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.1.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.30.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index b409da4ae..c20c301d3 100644 --- a/versions.json +++ b/versions.json @@ -169,174 +169,5 @@ ], "version": "29.1.0" }, - "29-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.1.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.1.0-rc.1.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.1.0-rc.1.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.1.0-rc.1.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.1.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.1.0-rc.1.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.1.0-rc.1.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.30.1.linux-amd64", - "sha256": "c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.30.1.linux-arm-v6", - "sha256": "348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.30.1.linux-arm-v7", - "sha256": "32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.30.1.linux-arm64", - "sha256": "31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.30.1.freebsd-amd64", - "sha256": "a5e3b8ebb9e1eec8db470dfe8e9a02971bc76c7f7152310247ff619645335b2c", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.30.1.freebsd-arm64", - "sha256": "e2665c6eab1dfe3c7294a7799370a26469c170761bf30f6c28b9858c529deb0c", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.30.1.netbsd-amd64", - "sha256": "94e3c850a2593cbf5d18b87caf6b28063048b00f86f5c7991e6ca3b95eb78af8", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.30.1.netbsd-arm64", - "sha256": "495b84d03440cd5494de87b21a8f109d4924ed3191975bf335f0520c77beee55", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.30.1.openbsd-amd64", - "sha256": "65f26756f30e0d5f1d6dc93cf4f870fb84811d2728585ff27d7fb77c0c8facd5", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.30.1.openbsd-arm64", - "sha256": "a63c1fb292f0d79a9bc11880d13270a3cdbcb5fd50fc8cbf8ce3d558ce91bdec", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.30.1.linux-ppc64le", - "sha256": "13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.30.1.linux-riscv64", - "sha256": "86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.30.1.linux-s390x", - "sha256": "b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.30.1.windows-amd64.exe", - "sha256": "3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.30.1.windows-arm64.exe", - "sha256": "a5270fa6b53604cdc510300e9752e1e15afdfba7b2cea2aea5b6d4b609034e74", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-arm64.exe" - } - }, - "version": "0.30.1" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "53528ecff0182546d92d7cc3f50dc78f9b387c3da68b4a3fd0cf2c48dab77133", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "8cd7eb5f95bacb536cc407111662e2c205d67d9abfea5dcb8400be8418db60d1", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "881a70b6d6e9ea1637746b0d5dbdaf83032b2f7952d4ee4b69f8f38b816909d1", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-aarch64.exe" - } - }, - "version": "2.40.3" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "29.1.0-rc.1" - } + "29-rc": null } From c9a3e1e39b96905847c42a3e69c137430a54e158 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 28 Nov 2025 10:04:31 -0800 Subject: [PATCH 556/667] Update 29 to 29.1.1 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index bae63c924..729a67f14 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.1.0 +ENV DOCKER_VERSION 29.1.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 795e099f9..b1a0cab19 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 061057e61..18d30f96b 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 882b3bd09..c6de31ade 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.1.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.0.zip +ENV DOCKER_VERSION 29.1.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.1.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index d06a22512..8fc8dbe4f 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.1.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.0.zip +ENV DOCKER_VERSION 29.1.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.1.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/versions.json b/versions.json index c20c301d3..c6500010a 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.1.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.1.0" + "version": "29.1.1" }, "29-rc": null } From d3eb8c607eb21544f3d923e538981a6abbf2788c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 2 Dec 2025 04:04:15 -0800 Subject: [PATCH 557/667] Update 29 to compose 5.0.0 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 729a67f14..173d0460c 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 2.40.3 +ENV DOCKER_COMPOSE_VERSION 5.0.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64'; \ - sha256='dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372'; \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-x86_64'; \ + sha256='5091bac5729ce968c602d157c2f0b959b7b367d4efb70aa864eb9ae78eebe13e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6'; \ - sha256='cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871'; \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv6'; \ + sha256='119ba4f6e2b3b2deb8e8bc57fbc1a73c9197b34c4118770582eedc582c2c5ed6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7'; \ - sha256='66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29'; \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv7'; \ + sha256='0feac2ca0dd33f40eebdbe8744b06eea2fe768c311b2fa3e29814b27ab832ccb'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64'; \ - sha256='d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137'; \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-aarch64'; \ + sha256='d68ba7053066a44a51ee33b7dcdc106d8c8745eb0eaf46dc59fbbeb22ec46392'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le'; \ - sha256='9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c'; \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-ppc64le'; \ + sha256='449dd11d3468dca4e1a33426cfebcd67dd097583ea4456b47878ccee907965b9'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64'; \ - sha256='b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd'; \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-riscv64'; \ + sha256='550938fcca6816dfe1b6ca10387f88860ac0f11f363ca39fa012d3d64364e479'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x'; \ - sha256='3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe'; \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-s390x'; \ + sha256='0a291c1fb6887ce3a81005a9bef6b8e6c666f225d9b5e290cd564f9d19de6cc5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index c6de31ade..7f205d564 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 +ENV DOCKER_COMPOSE_VERSION 5.0.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 8fc8dbe4f..81b367450 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 2.40.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532 +ENV DOCKER_COMPOSE_VERSION 5.0.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index c6500010a..a6578e10e 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "dba9d98e1ba5bfe11d88c99b9bd32fc4a0624a30fafe68eea34d61a3e42fd372", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-x86_64" + "sha256": "5091bac5729ce968c602d157c2f0b959b7b367d4efb70aa864eb9ae78eebe13e", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "cea4d6b6de410d220426806ef67ce7fadb4b914029f49a66fb222d4525ac6871", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv6" + "sha256": "119ba4f6e2b3b2deb8e8bc57fbc1a73c9197b34c4118770582eedc582c2c5ed6", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "66aa2f460820b17aaa71e65b2c70e55eb27c11bdb9816169c322065a5b016d29", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-armv7" + "sha256": "0feac2ca0dd33f40eebdbe8744b06eea2fe768c311b2fa3e29814b27ab832ccb", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d26373b19e89160546d15407516cc59f453030d9bc5b43ba7faf16f7b4980137", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-aarch64" + "sha256": "d68ba7053066a44a51ee33b7dcdc106d8c8745eb0eaf46dc59fbbeb22ec46392", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "53528ecff0182546d92d7cc3f50dc78f9b387c3da68b4a3fd0cf2c48dab77133", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-x86_64" + "sha256": "6d68486bede28047b2715f3ff9ecd57d38e459badc8a9eb6e004d0d0810c5d97", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "8cd7eb5f95bacb536cc407111662e2c205d67d9abfea5dcb8400be8418db60d1", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-darwin-aarch64" + "sha256": "befac99c791df69b2703fccb7031e33197b5400d048d2ef11e209f85e0bd6638", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "9be50cafe912442b27af48c44516b7ce2a65777ff121acf241dd5dba09d4f36c", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-ppc64le" + "sha256": "449dd11d3468dca4e1a33426cfebcd67dd097583ea4456b47878ccee907965b9", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "b52a2dcb0c221b5abd1d14729ed118aa24cf79012b5f2f992ddf6bc9c2e7f9fd", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-riscv64" + "sha256": "550938fcca6816dfe1b6ca10387f88860ac0f11f363ca39fa012d3d64364e479", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "3caf6694c974d13a2754689ffb8f93bc29d084ee60fb7f9ebd4b682264dad9fe", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-linux-s390x" + "sha256": "0a291c1fb6887ce3a81005a9bef6b8e6c666f225d9b5e290cd564f9d19de6cc5", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "4c864dd7f879dd40366e087e68a8a02cbcf018be0128867b13369898e67e1532", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-x86_64.exe" + "sha256": "e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "881a70b6d6e9ea1637746b0d5dbdaf83032b2f7952d4ee4b69f8f38b816909d1", - "url": "https://github.com/docker/compose/releases/download/v2.40.3/docker-compose-windows-aarch64.exe" + "sha256": "e8b20d796313d29125dd4db687636109145bc8944bbde4412b85e06f224612d4", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-aarch64.exe" } }, - "version": "2.40.3" + "version": "5.0.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From ece7b8f349d13fa2329564492de50b58ad1b5d8c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 2 Dec 2025 16:04:13 -0800 Subject: [PATCH 558/667] Update 29 to 29.1.2 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 173d0460c..913c32d3d 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.1.1 +ENV DOCKER_VERSION 29.1.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index b1a0cab19..c47cfceac 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 18d30f96b..945271623 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 7f205d564..4cbf8e729 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.1.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.1.zip +ENV DOCKER_VERSION 29.1.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.2.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 81b367450..97f747577 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.1.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.1.zip +ENV DOCKER_VERSION 29.1.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.2.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/versions.json b/versions.json index a6578e10e..82d09ec35 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.2.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.1.1" + "version": "29.1.2" }, "29-rc": null } From 7d9dcaed61f077774a231b20e6717442b5119fcf Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 3 Dec 2025 17:25:08 +0100 Subject: [PATCH 559/667] Update to Alpine 3.23 --- 29/cli/Dockerfile | 2 +- 29/dind/Dockerfile | 2 +- Dockerfile-cli.template | 2 +- Dockerfile-dind.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 913c32d3d..db83b00c7 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.22 +FROM alpine:3.23 RUN apk add --no-cache \ ca-certificates \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 945271623..079a5af61 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -40,7 +40,7 @@ RUN set -eux; \ ip6tables-restore \ ; do \ # "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 +# https://pkgs.alpinelinux.org/contents?branch=v3.23&name=iptables-legacy&arch=x86_64 b="$(command -v "${f/tables/tables-legacy}")"; \ "$b" --version; \ ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 7d64c0b50..64b8fff34 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -1,5 +1,5 @@ {{ include "shared" -}} -FROM alpine:3.22 +FROM alpine:3.23 RUN apk add --no-cache \ ca-certificates \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 69b276594..ee4ec1c69 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -35,7 +35,7 @@ RUN set -eux; \ ip6tables-restore \ ; do \ # "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.22&name=iptables-legacy&arch=x86_64 +# https://pkgs.alpinelinux.org/contents?branch=v3.23&name=iptables-legacy&arch=x86_64 b="$(command -v "${f/tables/tables-legacy}")"; \ "$b" --version; \ ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ From a6130b3dd7f1c3e938c497c29e671b3532de2bc9 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 12 Dec 2025 10:04:13 -0800 Subject: [PATCH 560/667] Update 29 to 29.1.3 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index db83b00c7..c433e566b 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.1.2 +ENV DOCKER_VERSION 29.1.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index c47cfceac..36dd66238 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 079a5af61..b99ecd592 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 4cbf8e729..dec0e8208 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.1.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.2.zip +ENV DOCKER_VERSION 29.1.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.3.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 97f747577..83737b6a3 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.1.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.2.zip +ENV DOCKER_VERSION 29.1.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.3.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/versions.json b/versions.json index 82d09ec35..c03258d8d 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.3.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.1.2" + "version": "29.1.3" }, "29-rc": null } From 4f2fad0a9da1d5c7b2e710c543c7fa1543bf1f2d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Dec 2025 12:39:33 -0800 Subject: [PATCH 561/667] Update 29-rc to 29.2.0-rc.1, buildx 0.30.1, compose 5.0.0 --- 29-rc/cli/Dockerfile | 167 ++++++++++++ 29-rc/cli/docker-entrypoint.sh | 61 +++++ 29-rc/cli/modprobe.sh | 20 ++ 29-rc/dind-rootless/Dockerfile | 55 ++++ 29-rc/dind/Dockerfile | 108 ++++++++ 29-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 171 ++++++++++++- 9 files changed, 1001 insertions(+), 1 deletion(-) create mode 100644 29-rc/cli/Dockerfile create mode 100755 29-rc/cli/docker-entrypoint.sh create mode 100755 29-rc/cli/modprobe.sh create mode 100644 29-rc/dind-rootless/Dockerfile create mode 100644 29-rc/dind/Dockerfile create mode 100755 29-rc/dind/dockerd-entrypoint.sh create mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile new file mode 100644 index 000000000..572543213 --- /dev/null +++ b/29-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.23 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 29.2.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.30.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64'; \ + sha256='c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6'; \ + sha256='348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7'; \ + sha256='32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64'; \ + sha256='31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le'; \ + sha256='13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64'; \ + sha256='86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x'; \ + sha256='b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 5.0.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-x86_64'; \ + sha256='5091bac5729ce968c602d157c2f0b959b7b367d4efb70aa864eb9ae78eebe13e'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv6'; \ + sha256='119ba4f6e2b3b2deb8e8bc57fbc1a73c9197b34c4118770582eedc582c2c5ed6'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv7'; \ + sha256='0feac2ca0dd33f40eebdbe8744b06eea2fe768c311b2fa3e29814b27ab832ccb'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-aarch64'; \ + sha256='d68ba7053066a44a51ee33b7dcdc106d8c8745eb0eaf46dc59fbbeb22ec46392'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-ppc64le'; \ + sha256='449dd11d3468dca4e1a33426cfebcd67dd097583ea4456b47878ccee907965b9'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-riscv64'; \ + sha256='550938fcca6816dfe1b6ca10387f88860ac0f11f363ca39fa012d3d64364e479'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-s390x'; \ + sha256='0a291c1fb6887ce3a81005a9bef6b8e6c666f225d9b5e290cd564f9d19de6cc5'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/29-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/29-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..b5b8d8185 --- /dev/null +++ b/29-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-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 +# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.2.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.2.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile new file mode 100644 index 000000000..a0a21c9e2 --- /dev/null +++ b/29-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.23&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..8a291dfa5 --- /dev/null +++ b/29-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..702a850bc --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.2.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.30.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.0.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..9d74e825c --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.2.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.30.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.0.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index c03258d8d..f26be20f5 100644 --- a/versions.json +++ b/versions.json @@ -169,5 +169,174 @@ ], "version": "29.1.3" }, - "29-rc": null + "29-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.2.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.2.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.30.1.linux-amd64", + "sha256": "c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.30.1.linux-arm-v6", + "sha256": "348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.30.1.linux-arm-v7", + "sha256": "32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.30.1.linux-arm64", + "sha256": "31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.30.1.freebsd-amd64", + "sha256": "a5e3b8ebb9e1eec8db470dfe8e9a02971bc76c7f7152310247ff619645335b2c", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.30.1.freebsd-arm64", + "sha256": "e2665c6eab1dfe3c7294a7799370a26469c170761bf30f6c28b9858c529deb0c", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.30.1.netbsd-amd64", + "sha256": "94e3c850a2593cbf5d18b87caf6b28063048b00f86f5c7991e6ca3b95eb78af8", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.30.1.netbsd-arm64", + "sha256": "495b84d03440cd5494de87b21a8f109d4924ed3191975bf335f0520c77beee55", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.30.1.openbsd-amd64", + "sha256": "65f26756f30e0d5f1d6dc93cf4f870fb84811d2728585ff27d7fb77c0c8facd5", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.30.1.openbsd-arm64", + "sha256": "a63c1fb292f0d79a9bc11880d13270a3cdbcb5fd50fc8cbf8ce3d558ce91bdec", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.30.1.linux-ppc64le", + "sha256": "13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.30.1.linux-riscv64", + "sha256": "86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.30.1.linux-s390x", + "sha256": "b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.30.1.windows-amd64.exe", + "sha256": "3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.30.1.windows-arm64.exe", + "sha256": "a5270fa6b53604cdc510300e9752e1e15afdfba7b2cea2aea5b6d4b609034e74", + "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-arm64.exe" + } + }, + "version": "0.30.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "5091bac5729ce968c602d157c2f0b959b7b367d4efb70aa864eb9ae78eebe13e", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "119ba4f6e2b3b2deb8e8bc57fbc1a73c9197b34c4118770582eedc582c2c5ed6", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "0feac2ca0dd33f40eebdbe8744b06eea2fe768c311b2fa3e29814b27ab832ccb", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "d68ba7053066a44a51ee33b7dcdc106d8c8745eb0eaf46dc59fbbeb22ec46392", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "6d68486bede28047b2715f3ff9ecd57d38e459badc8a9eb6e004d0d0810c5d97", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "befac99c791df69b2703fccb7031e33197b5400d048d2ef11e209f85e0bd6638", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "449dd11d3468dca4e1a33426cfebcd67dd097583ea4456b47878ccee907965b9", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "550938fcca6816dfe1b6ca10387f88860ac0f11f363ca39fa012d3d64364e479", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "0a291c1fb6887ce3a81005a9bef6b8e6c666f225d9b5e290cd564f9d19de6cc5", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "e8b20d796313d29125dd4db687636109145bc8944bbde4412b85e06f224612d4", + "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-aarch64.exe" + } + }, + "version": "5.0.0" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "29.2.0-rc.1" + } } From ca79f996361ac13c7f31bbdb96c802c1189e1956 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Dec 2025 10:04:15 -0800 Subject: [PATCH 562/667] Update 29 to compose 5.0.1 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index c433e566b..8b7131364 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.0.0 +ENV DOCKER_COMPOSE_VERSION 5.0.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-x86_64'; \ - sha256='5091bac5729ce968c602d157c2f0b959b7b367d4efb70aa864eb9ae78eebe13e'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-x86_64'; \ + sha256='cdc1df64412ed009312afbc044b3625144d06c07736e2f7a77fb0460531b9327'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv6'; \ - sha256='119ba4f6e2b3b2deb8e8bc57fbc1a73c9197b34c4118770582eedc582c2c5ed6'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv6'; \ + sha256='b19c5b17edfc2202921beaf0e672b3851276f414544b66dce354e3d613d00458'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv7'; \ - sha256='0feac2ca0dd33f40eebdbe8744b06eea2fe768c311b2fa3e29814b27ab832ccb'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv7'; \ + sha256='f2262cc9e210bf6a01b054ffd96283996e3af66d5a117b70e1b573517c54f152'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-aarch64'; \ - sha256='d68ba7053066a44a51ee33b7dcdc106d8c8745eb0eaf46dc59fbbeb22ec46392'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-aarch64'; \ + sha256='e3b36491a75f92c35ebfbbe6e4741bd2429664edf3971427983d67c0b21e7d1d'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-ppc64le'; \ - sha256='449dd11d3468dca4e1a33426cfebcd67dd097583ea4456b47878ccee907965b9'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-ppc64le'; \ + sha256='e3f9031f60a31f3c6adff7c78f2ab654d462aab711699de53345139e27e91973'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-riscv64'; \ - sha256='550938fcca6816dfe1b6ca10387f88860ac0f11f363ca39fa012d3d64364e479'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-riscv64'; \ + sha256='50f31386a62b77e95068573ac86d6f1be70fb1196ea92ae57757aa1d6fa2aa8d'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-s390x'; \ - sha256='0a291c1fb6887ce3a81005a9bef6b8e6c666f225d9b5e290cd564f9d19de6cc5'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-s390x'; \ + sha256='7176f6a356ef0d764a9fe8f82873018e89e9f83008069c5252e0b3cf2beca634'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index dec0e8208..d2e73d691 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9 +ENV DOCKER_COMPOSE_VERSION 5.0.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 83737b6a3..baf270af6 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9 +ENV DOCKER_COMPOSE_VERSION 5.0.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f26be20f5..1d66098f6 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "5091bac5729ce968c602d157c2f0b959b7b367d4efb70aa864eb9ae78eebe13e", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-x86_64" + "sha256": "cdc1df64412ed009312afbc044b3625144d06c07736e2f7a77fb0460531b9327", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "119ba4f6e2b3b2deb8e8bc57fbc1a73c9197b34c4118770582eedc582c2c5ed6", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv6" + "sha256": "b19c5b17edfc2202921beaf0e672b3851276f414544b66dce354e3d613d00458", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "0feac2ca0dd33f40eebdbe8744b06eea2fe768c311b2fa3e29814b27ab832ccb", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv7" + "sha256": "f2262cc9e210bf6a01b054ffd96283996e3af66d5a117b70e1b573517c54f152", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d68ba7053066a44a51ee33b7dcdc106d8c8745eb0eaf46dc59fbbeb22ec46392", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-aarch64" + "sha256": "e3b36491a75f92c35ebfbbe6e4741bd2429664edf3971427983d67c0b21e7d1d", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "6d68486bede28047b2715f3ff9ecd57d38e459badc8a9eb6e004d0d0810c5d97", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-darwin-x86_64" + "sha256": "dc94eecbe55c2d3c32aecc1fefc63b6ee63086f18bbbf5f4dac91b80f8f6b51b", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "befac99c791df69b2703fccb7031e33197b5400d048d2ef11e209f85e0bd6638", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-darwin-aarch64" + "sha256": "74ddfae9ca673e11babe45b0945fe825c0fb1f16e56f9772b4ee7a2a9d00bf19", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "449dd11d3468dca4e1a33426cfebcd67dd097583ea4456b47878ccee907965b9", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-ppc64le" + "sha256": "e3f9031f60a31f3c6adff7c78f2ab654d462aab711699de53345139e27e91973", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "550938fcca6816dfe1b6ca10387f88860ac0f11f363ca39fa012d3d64364e479", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-riscv64" + "sha256": "50f31386a62b77e95068573ac86d6f1be70fb1196ea92ae57757aa1d6fa2aa8d", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "0a291c1fb6887ce3a81005a9bef6b8e6c666f225d9b5e290cd564f9d19de6cc5", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-s390x" + "sha256": "7176f6a356ef0d764a9fe8f82873018e89e9f83008069c5252e0b3cf2beca634", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe" + "sha256": "2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "e8b20d796313d29125dd4db687636109145bc8944bbde4412b85e06f224612d4", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-aarch64.exe" + "sha256": "63aff6abc96d7b838aef2646e1003435bddd82774ff3e5ec2174a7c185a6d0c8", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-aarch64.exe" } }, - "version": "5.0.0" + "version": "5.0.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From d9bae6519a1b0a9c73fab9a859e0c5c5131b0176 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Dec 2025 10:06:06 -0800 Subject: [PATCH 563/667] Update 29-rc to compose 5.0.1 --- 29-rc/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 572543213..ad4303c09 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.0.0 +ENV DOCKER_COMPOSE_VERSION 5.0.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-x86_64'; \ - sha256='5091bac5729ce968c602d157c2f0b959b7b367d4efb70aa864eb9ae78eebe13e'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-x86_64'; \ + sha256='cdc1df64412ed009312afbc044b3625144d06c07736e2f7a77fb0460531b9327'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv6'; \ - sha256='119ba4f6e2b3b2deb8e8bc57fbc1a73c9197b34c4118770582eedc582c2c5ed6'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv6'; \ + sha256='b19c5b17edfc2202921beaf0e672b3851276f414544b66dce354e3d613d00458'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv7'; \ - sha256='0feac2ca0dd33f40eebdbe8744b06eea2fe768c311b2fa3e29814b27ab832ccb'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv7'; \ + sha256='f2262cc9e210bf6a01b054ffd96283996e3af66d5a117b70e1b573517c54f152'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-aarch64'; \ - sha256='d68ba7053066a44a51ee33b7dcdc106d8c8745eb0eaf46dc59fbbeb22ec46392'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-aarch64'; \ + sha256='e3b36491a75f92c35ebfbbe6e4741bd2429664edf3971427983d67c0b21e7d1d'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-ppc64le'; \ - sha256='449dd11d3468dca4e1a33426cfebcd67dd097583ea4456b47878ccee907965b9'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-ppc64le'; \ + sha256='e3f9031f60a31f3c6adff7c78f2ab654d462aab711699de53345139e27e91973'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-riscv64'; \ - sha256='550938fcca6816dfe1b6ca10387f88860ac0f11f363ca39fa012d3d64364e479'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-riscv64'; \ + sha256='50f31386a62b77e95068573ac86d6f1be70fb1196ea92ae57757aa1d6fa2aa8d'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-s390x'; \ - sha256='0a291c1fb6887ce3a81005a9bef6b8e6c666f225d9b5e290cd564f9d19de6cc5'; \ + url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-s390x'; \ + sha256='7176f6a356ef0d764a9fe8f82873018e89e9f83008069c5252e0b3cf2beca634'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 702a850bc..1fa3c43cf 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9 +ENV DOCKER_COMPOSE_VERSION 5.0.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 9d74e825c..4977ec647 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9 +ENV DOCKER_COMPOSE_VERSION 5.0.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 1d66098f6..1dea64de9 100644 --- a/versions.json +++ b/versions.json @@ -273,61 +273,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "5091bac5729ce968c602d157c2f0b959b7b367d4efb70aa864eb9ae78eebe13e", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-x86_64" + "sha256": "cdc1df64412ed009312afbc044b3625144d06c07736e2f7a77fb0460531b9327", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "119ba4f6e2b3b2deb8e8bc57fbc1a73c9197b34c4118770582eedc582c2c5ed6", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv6" + "sha256": "b19c5b17edfc2202921beaf0e672b3851276f414544b66dce354e3d613d00458", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "0feac2ca0dd33f40eebdbe8744b06eea2fe768c311b2fa3e29814b27ab832ccb", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-armv7" + "sha256": "f2262cc9e210bf6a01b054ffd96283996e3af66d5a117b70e1b573517c54f152", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d68ba7053066a44a51ee33b7dcdc106d8c8745eb0eaf46dc59fbbeb22ec46392", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-aarch64" + "sha256": "e3b36491a75f92c35ebfbbe6e4741bd2429664edf3971427983d67c0b21e7d1d", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "6d68486bede28047b2715f3ff9ecd57d38e459badc8a9eb6e004d0d0810c5d97", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-darwin-x86_64" + "sha256": "dc94eecbe55c2d3c32aecc1fefc63b6ee63086f18bbbf5f4dac91b80f8f6b51b", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "befac99c791df69b2703fccb7031e33197b5400d048d2ef11e209f85e0bd6638", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-darwin-aarch64" + "sha256": "74ddfae9ca673e11babe45b0945fe825c0fb1f16e56f9772b4ee7a2a9d00bf19", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "449dd11d3468dca4e1a33426cfebcd67dd097583ea4456b47878ccee907965b9", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-ppc64le" + "sha256": "e3f9031f60a31f3c6adff7c78f2ab654d462aab711699de53345139e27e91973", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "550938fcca6816dfe1b6ca10387f88860ac0f11f363ca39fa012d3d64364e479", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-riscv64" + "sha256": "50f31386a62b77e95068573ac86d6f1be70fb1196ea92ae57757aa1d6fa2aa8d", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "0a291c1fb6887ce3a81005a9bef6b8e6c666f225d9b5e290cd564f9d19de6cc5", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-linux-s390x" + "sha256": "7176f6a356ef0d764a9fe8f82873018e89e9f83008069c5252e0b3cf2beca634", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e8a5338e20bc6d30ae38db5533ce63ebf3c229801c20a74051fd06a650e5a8f9", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-x86_64.exe" + "sha256": "2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "e8b20d796313d29125dd4db687636109145bc8944bbde4412b85e06f224612d4", - "url": "https://github.com/docker/compose/releases/download/v5.0.0/docker-compose-windows-aarch64.exe" + "sha256": "63aff6abc96d7b838aef2646e1003435bddd82774ff3e5ec2174a7c185a6d0c8", + "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-aarch64.exe" } }, - "version": "5.0.0" + "version": "5.0.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From ff12c497b30da3650320f88e71f55e1d719301b5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 9 Jan 2026 04:04:13 -0800 Subject: [PATCH 564/667] Update 29 to 29.1.4 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 8b7131364..25816c822 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.1.3 +ENV DOCKER_VERSION 29.1.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 36dd66238..e663d9fbb 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index b99ecd592..c68a9eaa1 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.4.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.4.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.4.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.4.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index d2e73d691..8d2c397f5 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.1.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.3.zip +ENV DOCKER_VERSION 29.1.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index baf270af6..e2e541e28 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.1.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.3.zip +ENV DOCKER_VERSION 29.1.4 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.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/versions.json b/versions.json index 1dea64de9..fc7098de7 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.4.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.4.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.4.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.4.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.4.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.3.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.4.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.1.3" + "version": "29.1.4" }, "29-rc": { "arches": { From fb8a5acf48645ef11745f3561111688e188cb73f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 16 Jan 2026 10:04:15 -0800 Subject: [PATCH 565/667] Update 29 to 29.1.5 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 25816c822..be75bd190 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.1.4 +ENV DOCKER_VERSION 29.1.5 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.5.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.5.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index e663d9fbb..586247ec2 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.1.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index c68a9eaa1..3abea567c 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.5.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.1.5.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.5.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.4.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.5.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 8d2c397f5..167130a59 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.1.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.4.zip +ENV DOCKER_VERSION 29.1.5 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.5.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index e2e541e28..17c597b2f 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.1.4 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.4.zip +ENV DOCKER_VERSION 29.1.5 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.5.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/versions.json b/versions.json index fc7098de7..c8a106c3a 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.5.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.5.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.5.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.5.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.4.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.4.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.5.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.5.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.4.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.5.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.1.4" + "version": "29.1.5" }, "29-rc": { "arches": { From 59269e0bd5ee685076ca66128edfbf349ab6d070 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 19 Jan 2026 10:04:20 -0800 Subject: [PATCH 566/667] Update 29-rc to 29.2.0-rc.2 --- 29-rc/cli/Dockerfile | 10 +++++----- 29-rc/dind-rootless/Dockerfile | 4 ++-- 29-rc/dind/Dockerfile | 8 ++++---- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- .../windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index ad4303c09..ee8c52ced 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.2.0-rc.1 +ENV DOCKER_VERSION 29.2.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile index b5b8d8185..afff4bc64 100644 --- a/29-rc/dind-rootless/Dockerfile +++ b/29-rc/dind-rootless/Dockerfile @@ -25,10 +25,10 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.2.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.2.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile index a0a21c9e2..ba6eb54dc 100644 --- a/29-rc/dind/Dockerfile +++ b/29-rc/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 1fa3c43cf..9cb9afe4a 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/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 29.2.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.1.zip +ENV DOCKER_VERSION 29.2.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.2.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/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 4977ec647..166cd6bde 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/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 29.2.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.1.zip +ENV DOCKER_VERSION 29.2.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.2.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/versions.json b/versions.json index c8a106c3a..737e00cc3 100644 --- a/versions.json +++ b/versions.json @@ -172,21 +172,21 @@ "29-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.2.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.2.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.2.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.2.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.2.zip" } }, "buildx": { @@ -337,6 +337,6 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.2.0-rc.1" + "version": "29.2.0-rc.2" } } From 7ab0ff53d07b833c9c0331921e823640865149d2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 21 Jan 2026 04:04:15 -0800 Subject: [PATCH 567/667] Update 29 to compose 5.0.2 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index be75bd190..15d7caeca 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.0.1 +ENV DOCKER_COMPOSE_VERSION 5.0.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-x86_64'; \ - sha256='cdc1df64412ed009312afbc044b3625144d06c07736e2f7a77fb0460531b9327'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-x86_64'; \ + sha256='2d880f723d3da7c779c54fdaea91a842fca8af55d1397f1ed8d7cbab3dd7af67'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv6'; \ - sha256='b19c5b17edfc2202921beaf0e672b3851276f414544b66dce354e3d613d00458'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv6'; \ + sha256='6618f69bff2b9d2119164e4b44038e1b049c3cc9db39d49f8560db254b0a24b7'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv7'; \ - sha256='f2262cc9e210bf6a01b054ffd96283996e3af66d5a117b70e1b573517c54f152'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv7'; \ + sha256='d9a0742638f15bd91598ce465cca8718490d967cfb1a28305c388f214d09976b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-aarch64'; \ - sha256='e3b36491a75f92c35ebfbbe6e4741bd2429664edf3971427983d67c0b21e7d1d'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-aarch64'; \ + sha256='ac7810e0cd56a5b58576688196fafa843e07e8241fb91018a736d549ea20a3f3'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-ppc64le'; \ - sha256='e3f9031f60a31f3c6adff7c78f2ab654d462aab711699de53345139e27e91973'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-ppc64le'; \ + sha256='1e7ff60971411ffba30208c24c6f0988f8589b9d7bf7783c42f229e95f0648c3'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-riscv64'; \ - sha256='50f31386a62b77e95068573ac86d6f1be70fb1196ea92ae57757aa1d6fa2aa8d'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-riscv64'; \ + sha256='745cc32f394cd68bb4f09124c43d5d4532277859b6c92efab619722af6eac686'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-s390x'; \ - sha256='7176f6a356ef0d764a9fe8f82873018e89e9f83008069c5252e0b3cf2beca634'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-s390x'; \ + sha256='d5a9fb6b035cf040fceecccca4892cf55f291e9bf1bb7dd5eb089923bc6e0aac'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 167130a59..3026c07a5 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119 +ENV DOCKER_COMPOSE_VERSION 5.0.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 17c597b2f..cdc32e397 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119 +ENV DOCKER_COMPOSE_VERSION 5.0.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 737e00cc3..6b1fbc343 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "cdc1df64412ed009312afbc044b3625144d06c07736e2f7a77fb0460531b9327", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-x86_64" + "sha256": "2d880f723d3da7c779c54fdaea91a842fca8af55d1397f1ed8d7cbab3dd7af67", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "b19c5b17edfc2202921beaf0e672b3851276f414544b66dce354e3d613d00458", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv6" + "sha256": "6618f69bff2b9d2119164e4b44038e1b049c3cc9db39d49f8560db254b0a24b7", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "f2262cc9e210bf6a01b054ffd96283996e3af66d5a117b70e1b573517c54f152", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv7" + "sha256": "d9a0742638f15bd91598ce465cca8718490d967cfb1a28305c388f214d09976b", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "e3b36491a75f92c35ebfbbe6e4741bd2429664edf3971427983d67c0b21e7d1d", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-aarch64" + "sha256": "ac7810e0cd56a5b58576688196fafa843e07e8241fb91018a736d549ea20a3f3", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "dc94eecbe55c2d3c32aecc1fefc63b6ee63086f18bbbf5f4dac91b80f8f6b51b", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-darwin-x86_64" + "sha256": "766d6f9b305d89c3b8fe88cb6fb207fd7f531fbd63982b6136d058c1f98767bd", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "74ddfae9ca673e11babe45b0945fe825c0fb1f16e56f9772b4ee7a2a9d00bf19", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-darwin-aarch64" + "sha256": "72c7e684a1944cfb1765358d7ea7822cd209f25208ca235b914e761d9abb224e", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "e3f9031f60a31f3c6adff7c78f2ab654d462aab711699de53345139e27e91973", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-ppc64le" + "sha256": "1e7ff60971411ffba30208c24c6f0988f8589b9d7bf7783c42f229e95f0648c3", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "50f31386a62b77e95068573ac86d6f1be70fb1196ea92ae57757aa1d6fa2aa8d", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-riscv64" + "sha256": "745cc32f394cd68bb4f09124c43d5d4532277859b6c92efab619722af6eac686", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "7176f6a356ef0d764a9fe8f82873018e89e9f83008069c5252e0b3cf2beca634", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-s390x" + "sha256": "d5a9fb6b035cf040fceecccca4892cf55f291e9bf1bb7dd5eb089923bc6e0aac", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe" + "sha256": "e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "63aff6abc96d7b838aef2646e1003435bddd82774ff3e5ec2174a7c185a6d0c8", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-aarch64.exe" + "sha256": "275cbbdebb053bac7a87808cff75a24db6e3c6b069eb76715b7a63cfd9fbb07e", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-aarch64.exe" } }, - "version": "5.0.1" + "version": "5.0.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 124755ce915120d303d65e02e7138ae79b6f9cc6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 21 Jan 2026 04:06:19 -0800 Subject: [PATCH 568/667] Update 29-rc to compose 5.0.2 --- 29-rc/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index ee8c52ced..37b56a970 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.0.1 +ENV DOCKER_COMPOSE_VERSION 5.0.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-x86_64'; \ - sha256='cdc1df64412ed009312afbc044b3625144d06c07736e2f7a77fb0460531b9327'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-x86_64'; \ + sha256='2d880f723d3da7c779c54fdaea91a842fca8af55d1397f1ed8d7cbab3dd7af67'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv6'; \ - sha256='b19c5b17edfc2202921beaf0e672b3851276f414544b66dce354e3d613d00458'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv6'; \ + sha256='6618f69bff2b9d2119164e4b44038e1b049c3cc9db39d49f8560db254b0a24b7'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv7'; \ - sha256='f2262cc9e210bf6a01b054ffd96283996e3af66d5a117b70e1b573517c54f152'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv7'; \ + sha256='d9a0742638f15bd91598ce465cca8718490d967cfb1a28305c388f214d09976b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-aarch64'; \ - sha256='e3b36491a75f92c35ebfbbe6e4741bd2429664edf3971427983d67c0b21e7d1d'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-aarch64'; \ + sha256='ac7810e0cd56a5b58576688196fafa843e07e8241fb91018a736d549ea20a3f3'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-ppc64le'; \ - sha256='e3f9031f60a31f3c6adff7c78f2ab654d462aab711699de53345139e27e91973'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-ppc64le'; \ + sha256='1e7ff60971411ffba30208c24c6f0988f8589b9d7bf7783c42f229e95f0648c3'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-riscv64'; \ - sha256='50f31386a62b77e95068573ac86d6f1be70fb1196ea92ae57757aa1d6fa2aa8d'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-riscv64'; \ + sha256='745cc32f394cd68bb4f09124c43d5d4532277859b6c92efab619722af6eac686'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-s390x'; \ - sha256='7176f6a356ef0d764a9fe8f82873018e89e9f83008069c5252e0b3cf2beca634'; \ + url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-s390x'; \ + sha256='d5a9fb6b035cf040fceecccca4892cf55f291e9bf1bb7dd5eb089923bc6e0aac'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 9cb9afe4a..c018fb92d 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119 +ENV DOCKER_COMPOSE_VERSION 5.0.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 166cd6bde..bfcc5a1cb 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119 +ENV DOCKER_COMPOSE_VERSION 5.0.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6b1fbc343..82a4fa4d2 100644 --- a/versions.json +++ b/versions.json @@ -273,61 +273,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "cdc1df64412ed009312afbc044b3625144d06c07736e2f7a77fb0460531b9327", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-x86_64" + "sha256": "2d880f723d3da7c779c54fdaea91a842fca8af55d1397f1ed8d7cbab3dd7af67", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "b19c5b17edfc2202921beaf0e672b3851276f414544b66dce354e3d613d00458", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv6" + "sha256": "6618f69bff2b9d2119164e4b44038e1b049c3cc9db39d49f8560db254b0a24b7", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "f2262cc9e210bf6a01b054ffd96283996e3af66d5a117b70e1b573517c54f152", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-armv7" + "sha256": "d9a0742638f15bd91598ce465cca8718490d967cfb1a28305c388f214d09976b", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "e3b36491a75f92c35ebfbbe6e4741bd2429664edf3971427983d67c0b21e7d1d", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-aarch64" + "sha256": "ac7810e0cd56a5b58576688196fafa843e07e8241fb91018a736d549ea20a3f3", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "dc94eecbe55c2d3c32aecc1fefc63b6ee63086f18bbbf5f4dac91b80f8f6b51b", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-darwin-x86_64" + "sha256": "766d6f9b305d89c3b8fe88cb6fb207fd7f531fbd63982b6136d058c1f98767bd", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "74ddfae9ca673e11babe45b0945fe825c0fb1f16e56f9772b4ee7a2a9d00bf19", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-darwin-aarch64" + "sha256": "72c7e684a1944cfb1765358d7ea7822cd209f25208ca235b914e761d9abb224e", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "e3f9031f60a31f3c6adff7c78f2ab654d462aab711699de53345139e27e91973", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-ppc64le" + "sha256": "1e7ff60971411ffba30208c24c6f0988f8589b9d7bf7783c42f229e95f0648c3", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "50f31386a62b77e95068573ac86d6f1be70fb1196ea92ae57757aa1d6fa2aa8d", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-riscv64" + "sha256": "745cc32f394cd68bb4f09124c43d5d4532277859b6c92efab619722af6eac686", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "7176f6a356ef0d764a9fe8f82873018e89e9f83008069c5252e0b3cf2beca634", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-linux-s390x" + "sha256": "d5a9fb6b035cf040fceecccca4892cf55f291e9bf1bb7dd5eb089923bc6e0aac", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "2ae341f9152b4d90f561f84b8f2e263d5b60e1613c6841c804447819290c4119", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-x86_64.exe" + "sha256": "e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "63aff6abc96d7b838aef2646e1003435bddd82774ff3e5ec2174a7c185a6d0c8", - "url": "https://github.com/docker/compose/releases/download/v5.0.1/docker-compose-windows-aarch64.exe" + "sha256": "275cbbdebb053bac7a87808cff75a24db6e3c6b069eb76715b7a63cfd9fbb07e", + "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-aarch64.exe" } }, - "version": "5.0.1" + "version": "5.0.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From bfd42255bd460a18c2936eedcce7b07671a80ce6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 21 Jan 2026 22:04:15 -0800 Subject: [PATCH 569/667] Update 29 to buildx 0.31.0 --- 29/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 15d7caeca..2a2264488 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.30.1 +ENV DOCKER_BUILDX_VERSION 0.31.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64'; \ - sha256='c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-amd64'; \ + sha256='39cc424a730d8b7364c23a137582cb29e7f024b175bb595001ff6f90121b005b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6'; \ - sha256='348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v6'; \ + sha256='fad601a520d9da32ff72d5f844c08318bb66db7a9c150e01541170e4e275a724'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7'; \ - sha256='32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v7'; \ + sha256='68f3aff3e29d9c013a90bec8cd841a86d57670394870fe0aaaceafcdd28f4071'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64'; \ - sha256='31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm64'; \ + sha256='3192d6deafed620132da1acd7c68499e163c814bc2be988a3eb2c5302764a30a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le'; \ - sha256='13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-ppc64le'; \ + sha256='fe18282ceb82368e3b7fd79277e34d9904dfbfd0318a3c9fa2e4a2ab12f932e6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64'; \ - sha256='86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-riscv64'; \ + sha256='bb01f095fb6b3734e352c4f58b7ef294f054d990c899fbfcaf5aa3fe1efbd83c'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x'; \ - sha256='b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-s390x'; \ + sha256='b03b64ab619c073edbaa310d83f275c52b7380abf080d35ea936696eab42aba1'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 3026c07a5..9df58c01d 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.30.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 +ENV DOCKER_BUILDX_VERSION 0.31.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index cdc32e397..4ade0ba72 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.30.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 +ENV DOCKER_BUILDX_VERSION 0.31.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 82a4fa4d2..6a27693f2 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.30.1.linux-amd64", - "sha256": "c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64" + "file": "buildx-v0.31.0.linux-amd64", + "sha256": "39cc424a730d8b7364c23a137582cb29e7f024b175bb595001ff6f90121b005b", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.30.1.linux-arm-v6", - "sha256": "348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6" + "file": "buildx-v0.31.0.linux-arm-v6", + "sha256": "fad601a520d9da32ff72d5f844c08318bb66db7a9c150e01541170e4e275a724", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.30.1.linux-arm-v7", - "sha256": "32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7" + "file": "buildx-v0.31.0.linux-arm-v7", + "sha256": "68f3aff3e29d9c013a90bec8cd841a86d57670394870fe0aaaceafcdd28f4071", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.30.1.linux-arm64", - "sha256": "31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64" + "file": "buildx-v0.31.0.linux-arm64", + "sha256": "3192d6deafed620132da1acd7c68499e163c814bc2be988a3eb2c5302764a30a", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.30.1.freebsd-amd64", - "sha256": "a5e3b8ebb9e1eec8db470dfe8e9a02971bc76c7f7152310247ff619645335b2c", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-amd64" + "file": "buildx-v0.31.0.freebsd-amd64", + "sha256": "4093af8a217fc492409d54b495cb77718a209678aef25f86c64b244fca5c9a34", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.30.1.freebsd-arm64", - "sha256": "e2665c6eab1dfe3c7294a7799370a26469c170761bf30f6c28b9858c529deb0c", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-arm64" + "file": "buildx-v0.31.0.freebsd-arm64", + "sha256": "c3d7c338a9c4cfd859094b5a65cbb99bcc76f0ecc8920daa83ecd3b360261f56", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.30.1.netbsd-amd64", - "sha256": "94e3c850a2593cbf5d18b87caf6b28063048b00f86f5c7991e6ca3b95eb78af8", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-amd64" + "file": "buildx-v0.31.0.netbsd-amd64", + "sha256": "72889de9e57a968c611b9cdee8fee9a65b5fd8e4eb98100e7239cf9a747d07bf", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.30.1.netbsd-arm64", - "sha256": "495b84d03440cd5494de87b21a8f109d4924ed3191975bf335f0520c77beee55", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-arm64" + "file": "buildx-v0.31.0.netbsd-arm64", + "sha256": "f8cc61c794c24fb53001514dd63805a703becd3c06ddcdc217f417d5bdb21340", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.30.1.openbsd-amd64", - "sha256": "65f26756f30e0d5f1d6dc93cf4f870fb84811d2728585ff27d7fb77c0c8facd5", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-amd64" + "file": "buildx-v0.31.0.openbsd-amd64", + "sha256": "32d996e2702e8612d3d6569ce421036e538d5c37f385f4a0dddd450826007a17", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.30.1.openbsd-arm64", - "sha256": "a63c1fb292f0d79a9bc11880d13270a3cdbcb5fd50fc8cbf8ce3d558ce91bdec", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-arm64" + "file": "buildx-v0.31.0.openbsd-arm64", + "sha256": "f810e0b1203f5101f4c84d0f0377b350f90142dc8effb8f0ae3f2714dc80740e", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.30.1.linux-ppc64le", - "sha256": "13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le" + "file": "buildx-v0.31.0.linux-ppc64le", + "sha256": "fe18282ceb82368e3b7fd79277e34d9904dfbfd0318a3c9fa2e4a2ab12f932e6", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.30.1.linux-riscv64", - "sha256": "86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64" + "file": "buildx-v0.31.0.linux-riscv64", + "sha256": "bb01f095fb6b3734e352c4f58b7ef294f054d990c899fbfcaf5aa3fe1efbd83c", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.30.1.linux-s390x", - "sha256": "b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x" + "file": "buildx-v0.31.0.linux-s390x", + "sha256": "b03b64ab619c073edbaa310d83f275c52b7380abf080d35ea936696eab42aba1", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.30.1.windows-amd64.exe", - "sha256": "3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe" + "file": "buildx-v0.31.0.windows-amd64.exe", + "sha256": "4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.30.1.windows-arm64.exe", - "sha256": "a5270fa6b53604cdc510300e9752e1e15afdfba7b2cea2aea5b6d4b609034e74", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-arm64.exe" + "file": "buildx-v0.31.0.windows-arm64.exe", + "sha256": "a261a1a5c1fedcc937c7db96234bab0ad0e7e0d5578815520b574dcb505e76d3", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-arm64.exe" } }, - "version": "0.30.1" + "version": "0.31.0" }, "compose": { "arches": { From c4c9c5ae20d988c723aacc7228eb57f6c60a0ebf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 21 Jan 2026 22:06:11 -0800 Subject: [PATCH 570/667] Update 29-rc to buildx 0.31.0 --- 29-rc/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 37b56a970..5358a7b41 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.30.1 +ENV DOCKER_BUILDX_VERSION 0.31.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64'; \ - sha256='c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-amd64'; \ + sha256='39cc424a730d8b7364c23a137582cb29e7f024b175bb595001ff6f90121b005b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6'; \ - sha256='348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v6'; \ + sha256='fad601a520d9da32ff72d5f844c08318bb66db7a9c150e01541170e4e275a724'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7'; \ - sha256='32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v7'; \ + sha256='68f3aff3e29d9c013a90bec8cd841a86d57670394870fe0aaaceafcdd28f4071'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64'; \ - sha256='31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm64'; \ + sha256='3192d6deafed620132da1acd7c68499e163c814bc2be988a3eb2c5302764a30a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le'; \ - sha256='13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-ppc64le'; \ + sha256='fe18282ceb82368e3b7fd79277e34d9904dfbfd0318a3c9fa2e4a2ab12f932e6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64'; \ - sha256='86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-riscv64'; \ + sha256='bb01f095fb6b3734e352c4f58b7ef294f054d990c899fbfcaf5aa3fe1efbd83c'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x'; \ - sha256='b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-s390x'; \ + sha256='b03b64ab619c073edbaa310d83f275c52b7380abf080d35ea936696eab42aba1'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index c018fb92d..cce43615b 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.30.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 +ENV DOCKER_BUILDX_VERSION 0.31.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index bfcc5a1cb..c5b01fdb6 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.30.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71 +ENV DOCKER_BUILDX_VERSION 0.31.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 6a27693f2..e7d85b72e 100644 --- a/versions.json +++ b/versions.json @@ -192,82 +192,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.30.1.linux-amd64", - "sha256": "c37114fcd034025ec68e224657c8a5a850df472ded3ddcbca75ad3a7ebb9710d", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-amd64" + "file": "buildx-v0.31.0.linux-amd64", + "sha256": "39cc424a730d8b7364c23a137582cb29e7f024b175bb595001ff6f90121b005b", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.30.1.linux-arm-v6", - "sha256": "348d17c7cc881e9268255d6f404669ae29789003575d1da9d97b51cd6ca7f0dd", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v6" + "file": "buildx-v0.31.0.linux-arm-v6", + "sha256": "fad601a520d9da32ff72d5f844c08318bb66db7a9c150e01541170e4e275a724", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.30.1.linux-arm-v7", - "sha256": "32646cb57c43640a71c81f206897b78a8f1abe6b6db62bab115b5940fc5be884", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm-v7" + "file": "buildx-v0.31.0.linux-arm-v7", + "sha256": "68f3aff3e29d9c013a90bec8cd841a86d57670394870fe0aaaceafcdd28f4071", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.30.1.linux-arm64", - "sha256": "31d012d52d6df68aef4b55db62330967b562811f0de30cdfaa4505f314797c76", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-arm64" + "file": "buildx-v0.31.0.linux-arm64", + "sha256": "3192d6deafed620132da1acd7c68499e163c814bc2be988a3eb2c5302764a30a", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.30.1.freebsd-amd64", - "sha256": "a5e3b8ebb9e1eec8db470dfe8e9a02971bc76c7f7152310247ff619645335b2c", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-amd64" + "file": "buildx-v0.31.0.freebsd-amd64", + "sha256": "4093af8a217fc492409d54b495cb77718a209678aef25f86c64b244fca5c9a34", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.30.1.freebsd-arm64", - "sha256": "e2665c6eab1dfe3c7294a7799370a26469c170761bf30f6c28b9858c529deb0c", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.freebsd-arm64" + "file": "buildx-v0.31.0.freebsd-arm64", + "sha256": "c3d7c338a9c4cfd859094b5a65cbb99bcc76f0ecc8920daa83ecd3b360261f56", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.30.1.netbsd-amd64", - "sha256": "94e3c850a2593cbf5d18b87caf6b28063048b00f86f5c7991e6ca3b95eb78af8", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-amd64" + "file": "buildx-v0.31.0.netbsd-amd64", + "sha256": "72889de9e57a968c611b9cdee8fee9a65b5fd8e4eb98100e7239cf9a747d07bf", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.30.1.netbsd-arm64", - "sha256": "495b84d03440cd5494de87b21a8f109d4924ed3191975bf335f0520c77beee55", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.netbsd-arm64" + "file": "buildx-v0.31.0.netbsd-arm64", + "sha256": "f8cc61c794c24fb53001514dd63805a703becd3c06ddcdc217f417d5bdb21340", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.30.1.openbsd-amd64", - "sha256": "65f26756f30e0d5f1d6dc93cf4f870fb84811d2728585ff27d7fb77c0c8facd5", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-amd64" + "file": "buildx-v0.31.0.openbsd-amd64", + "sha256": "32d996e2702e8612d3d6569ce421036e538d5c37f385f4a0dddd450826007a17", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.30.1.openbsd-arm64", - "sha256": "a63c1fb292f0d79a9bc11880d13270a3cdbcb5fd50fc8cbf8ce3d558ce91bdec", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.openbsd-arm64" + "file": "buildx-v0.31.0.openbsd-arm64", + "sha256": "f810e0b1203f5101f4c84d0f0377b350f90142dc8effb8f0ae3f2714dc80740e", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.30.1.linux-ppc64le", - "sha256": "13523e8d1820019f404df31c7ec17c7a76c16f638dd04acc33f5d141f683247c", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-ppc64le" + "file": "buildx-v0.31.0.linux-ppc64le", + "sha256": "fe18282ceb82368e3b7fd79277e34d9904dfbfd0318a3c9fa2e4a2ab12f932e6", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.30.1.linux-riscv64", - "sha256": "86af30811ceaad9fc34a6bc02e5d093d1460ec24f125c47e639ed1fac9effe83", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-riscv64" + "file": "buildx-v0.31.0.linux-riscv64", + "sha256": "bb01f095fb6b3734e352c4f58b7ef294f054d990c899fbfcaf5aa3fe1efbd83c", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.30.1.linux-s390x", - "sha256": "b752c6824bcc355b012d6f595987706fef15243792fe755f50de76c979bc592d", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.linux-s390x" + "file": "buildx-v0.31.0.linux-s390x", + "sha256": "b03b64ab619c073edbaa310d83f275c52b7380abf080d35ea936696eab42aba1", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.30.1.windows-amd64.exe", - "sha256": "3c48e2da717c55518cf22a5b372f48f54cf3a58c9fae675b818a3311775e1b71", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-amd64.exe" + "file": "buildx-v0.31.0.windows-amd64.exe", + "sha256": "4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.30.1.windows-arm64.exe", - "sha256": "a5270fa6b53604cdc510300e9752e1e15afdfba7b2cea2aea5b6d4b609034e74", - "url": "https://github.com/docker/buildx/releases/download/v0.30.1/buildx-v0.30.1.windows-arm64.exe" + "file": "buildx-v0.31.0.windows-arm64.exe", + "sha256": "a261a1a5c1fedcc937c7db96234bab0ad0e7e0d5578815520b574dcb505e76d3", + "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-arm64.exe" } }, - "version": "0.30.1" + "version": "0.31.0" }, "compose": { "arches": { From e436640ce7609716ca4ace514a6d2b629f8d4997 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 26 Jan 2026 13:43:31 -0800 Subject: [PATCH 571/667] Update 29 to 29.2.0 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 2a2264488..61e058ae4 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.1.5 +ENV DOCKER_VERSION 29.2.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.2.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.2.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.2.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.2.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 586247ec2..b7aee1f54 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.1.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.2.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.2.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 3abea567c..639534ad8 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.1.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.2.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.1.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.2.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.1.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.2.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.1.5.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.2.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 9df58c01d..7bba8b08a 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.1.5 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.5.zip +ENV DOCKER_VERSION 29.2.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.2.0.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 4ade0ba72..378735d41 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.1.5 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.1.5.zip +ENV DOCKER_VERSION 29.2.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.2.0.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/versions.json b/versions.json index e7d85b72e..93ec97aeb 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.1.5.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.1.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.2.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.2.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.1.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.2.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.1.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.2.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.1.5.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.1.5.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.2.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.2.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.1.5.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.2.0.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.1.5" + "version": "29.2.0" }, "29-rc": { "arches": { From 1ff248f335fd1ab4918c94f7c73904787e924645 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 26 Jan 2026 13:45:25 -0800 Subject: [PATCH 572/667] Update 29-rc --- 29-rc/cli/Dockerfile | 167 ------------ 29-rc/cli/docker-entrypoint.sh | 61 ----- 29-rc/cli/modprobe.sh | 20 -- 29-rc/dind-rootless/Dockerfile | 55 ---- 29-rc/dind/Dockerfile | 108 -------- 29-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 171 +------------ 9 files changed, 1 insertion(+), 1001 deletions(-) delete mode 100644 29-rc/cli/Dockerfile delete mode 100755 29-rc/cli/docker-entrypoint.sh delete mode 100755 29-rc/cli/modprobe.sh delete mode 100644 29-rc/dind-rootless/Dockerfile delete mode 100644 29-rc/dind/Dockerfile delete mode 100755 29-rc/dind/dockerd-entrypoint.sh delete mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile deleted file mode 100644 index 5358a7b41..000000000 --- a/29-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.23 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 29.2.0-rc.2 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.31.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-amd64'; \ - sha256='39cc424a730d8b7364c23a137582cb29e7f024b175bb595001ff6f90121b005b'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v6'; \ - sha256='fad601a520d9da32ff72d5f844c08318bb66db7a9c150e01541170e4e275a724'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v7'; \ - sha256='68f3aff3e29d9c013a90bec8cd841a86d57670394870fe0aaaceafcdd28f4071'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm64'; \ - sha256='3192d6deafed620132da1acd7c68499e163c814bc2be988a3eb2c5302764a30a'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-ppc64le'; \ - sha256='fe18282ceb82368e3b7fd79277e34d9904dfbfd0318a3c9fa2e4a2ab12f932e6'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-riscv64'; \ - sha256='bb01f095fb6b3734e352c4f58b7ef294f054d990c899fbfcaf5aa3fe1efbd83c'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-s390x'; \ - sha256='b03b64ab619c073edbaa310d83f275c52b7380abf080d35ea936696eab42aba1'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 5.0.2 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-x86_64'; \ - sha256='2d880f723d3da7c779c54fdaea91a842fca8af55d1397f1ed8d7cbab3dd7af67'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv6'; \ - sha256='6618f69bff2b9d2119164e4b44038e1b049c3cc9db39d49f8560db254b0a24b7'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv7'; \ - sha256='d9a0742638f15bd91598ce465cca8718490d967cfb1a28305c388f214d09976b'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-aarch64'; \ - sha256='ac7810e0cd56a5b58576688196fafa843e07e8241fb91018a736d549ea20a3f3'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-ppc64le'; \ - sha256='1e7ff60971411ffba30208c24c6f0988f8589b9d7bf7783c42f229e95f0648c3'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-riscv64'; \ - sha256='745cc32f394cd68bb4f09124c43d5d4532277859b6c92efab619722af6eac686'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-s390x'; \ - sha256='d5a9fb6b035cf040fceecccca4892cf55f291e9bf1bb7dd5eb089923bc6e0aac'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/29-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/29-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile deleted file mode 100644 index afff4bc64..000000000 --- a/29-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-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 -# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.2.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.2.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile deleted file mode 100644 index ba6eb54dc..000000000 --- a/29-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.23&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 8a291dfa5..000000000 --- a/29-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index cce43615b..000000000 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.2.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.31.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index c5b01fdb6..000000000 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.2.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.31.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 93ec97aeb..f74ecf54b 100644 --- a/versions.json +++ b/versions.json @@ -169,174 +169,5 @@ ], "version": "29.2.0" }, - "29-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.2.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.2.0-rc.2.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.2.0-rc.2.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.2.0-rc.2.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.2.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.2.0-rc.2.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.2.0-rc.2.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.31.0.linux-amd64", - "sha256": "39cc424a730d8b7364c23a137582cb29e7f024b175bb595001ff6f90121b005b", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.31.0.linux-arm-v6", - "sha256": "fad601a520d9da32ff72d5f844c08318bb66db7a9c150e01541170e4e275a724", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.31.0.linux-arm-v7", - "sha256": "68f3aff3e29d9c013a90bec8cd841a86d57670394870fe0aaaceafcdd28f4071", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.31.0.linux-arm64", - "sha256": "3192d6deafed620132da1acd7c68499e163c814bc2be988a3eb2c5302764a30a", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.31.0.freebsd-amd64", - "sha256": "4093af8a217fc492409d54b495cb77718a209678aef25f86c64b244fca5c9a34", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.31.0.freebsd-arm64", - "sha256": "c3d7c338a9c4cfd859094b5a65cbb99bcc76f0ecc8920daa83ecd3b360261f56", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.31.0.netbsd-amd64", - "sha256": "72889de9e57a968c611b9cdee8fee9a65b5fd8e4eb98100e7239cf9a747d07bf", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.31.0.netbsd-arm64", - "sha256": "f8cc61c794c24fb53001514dd63805a703becd3c06ddcdc217f417d5bdb21340", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.31.0.openbsd-amd64", - "sha256": "32d996e2702e8612d3d6569ce421036e538d5c37f385f4a0dddd450826007a17", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.31.0.openbsd-arm64", - "sha256": "f810e0b1203f5101f4c84d0f0377b350f90142dc8effb8f0ae3f2714dc80740e", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.31.0.linux-ppc64le", - "sha256": "fe18282ceb82368e3b7fd79277e34d9904dfbfd0318a3c9fa2e4a2ab12f932e6", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.31.0.linux-riscv64", - "sha256": "bb01f095fb6b3734e352c4f58b7ef294f054d990c899fbfcaf5aa3fe1efbd83c", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.31.0.linux-s390x", - "sha256": "b03b64ab619c073edbaa310d83f275c52b7380abf080d35ea936696eab42aba1", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.31.0.windows-amd64.exe", - "sha256": "4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.31.0.windows-arm64.exe", - "sha256": "a261a1a5c1fedcc937c7db96234bab0ad0e7e0d5578815520b574dcb505e76d3", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-arm64.exe" - } - }, - "version": "0.31.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "2d880f723d3da7c779c54fdaea91a842fca8af55d1397f1ed8d7cbab3dd7af67", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "6618f69bff2b9d2119164e4b44038e1b049c3cc9db39d49f8560db254b0a24b7", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "d9a0742638f15bd91598ce465cca8718490d967cfb1a28305c388f214d09976b", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "ac7810e0cd56a5b58576688196fafa843e07e8241fb91018a736d549ea20a3f3", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "766d6f9b305d89c3b8fe88cb6fb207fd7f531fbd63982b6136d058c1f98767bd", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "72c7e684a1944cfb1765358d7ea7822cd209f25208ca235b914e761d9abb224e", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "1e7ff60971411ffba30208c24c6f0988f8589b9d7bf7783c42f229e95f0648c3", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "745cc32f394cd68bb4f09124c43d5d4532277859b6c92efab619722af6eac686", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "d5a9fb6b035cf040fceecccca4892cf55f291e9bf1bb7dd5eb089923bc6e0aac", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "275cbbdebb053bac7a87808cff75a24db6e3c6b069eb76715b7a63cfd9fbb07e", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-aarch64.exe" - } - }, - "version": "5.0.2" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "29.2.0-rc.2" - } + "29-rc": null } From c3ad7430083c6ee62c1f0cb91755a10739c7d10f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 28 Jan 2026 22:04:16 -0800 Subject: [PATCH 573/667] Update 29 to buildx 0.31.1 --- 29/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 61e058ae4..89daa12c2 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.31.0 +ENV DOCKER_BUILDX_VERSION 0.31.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-amd64'; \ - sha256='39cc424a730d8b7364c23a137582cb29e7f024b175bb595001ff6f90121b005b'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-amd64'; \ + sha256='dc8eaffbf29138123b4874d852522b12303c61246a5073fa0f025e4220317b1e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v6'; \ - sha256='fad601a520d9da32ff72d5f844c08318bb66db7a9c150e01541170e4e275a724'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v6'; \ + sha256='0b661aa682eb421fb497e080b02f58357bc1f1e83744ffc6fb8de2671f330e93'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v7'; \ - sha256='68f3aff3e29d9c013a90bec8cd841a86d57670394870fe0aaaceafcdd28f4071'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v7'; \ + sha256='9a3cd7007611be95608a623b01ce9749b667450bf57f756e112770eeaa3cde8b'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm64'; \ - sha256='3192d6deafed620132da1acd7c68499e163c814bc2be988a3eb2c5302764a30a'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm64'; \ + sha256='963c674c558dad2eefd42304a09020329a196ed16819b72396e7657eb69f031b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-ppc64le'; \ - sha256='fe18282ceb82368e3b7fd79277e34d9904dfbfd0318a3c9fa2e4a2ab12f932e6'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-ppc64le'; \ + sha256='67016c06ceaaf076f852f07f6172f0edc6d71fb6f1436664f9877db68e2ffcfe'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-riscv64'; \ - sha256='bb01f095fb6b3734e352c4f58b7ef294f054d990c899fbfcaf5aa3fe1efbd83c'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-riscv64'; \ + sha256='20ad44615fa09af8eccad4014040c0b59d5c83192337be0bd293b2cf732f606f'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-s390x'; \ - sha256='b03b64ab619c073edbaa310d83f275c52b7380abf080d35ea936696eab42aba1'; \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-s390x'; \ + sha256='759b12386f3ec701b4255986193d339fad3093033d4786caab04bbdb9cc0d10a'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 7bba8b08a..2e5750769 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.31.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192 +ENV DOCKER_BUILDX_VERSION 0.31.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 378735d41..581478dca 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.31.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192 +ENV DOCKER_BUILDX_VERSION 0.31.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f74ecf54b..02cfd6a9c 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.31.0.linux-amd64", - "sha256": "39cc424a730d8b7364c23a137582cb29e7f024b175bb595001ff6f90121b005b", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-amd64" + "file": "buildx-v0.31.1.linux-amd64", + "sha256": "dc8eaffbf29138123b4874d852522b12303c61246a5073fa0f025e4220317b1e", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.31.0.linux-arm-v6", - "sha256": "fad601a520d9da32ff72d5f844c08318bb66db7a9c150e01541170e4e275a724", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v6" + "file": "buildx-v0.31.1.linux-arm-v6", + "sha256": "0b661aa682eb421fb497e080b02f58357bc1f1e83744ffc6fb8de2671f330e93", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.31.0.linux-arm-v7", - "sha256": "68f3aff3e29d9c013a90bec8cd841a86d57670394870fe0aaaceafcdd28f4071", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm-v7" + "file": "buildx-v0.31.1.linux-arm-v7", + "sha256": "9a3cd7007611be95608a623b01ce9749b667450bf57f756e112770eeaa3cde8b", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.31.0.linux-arm64", - "sha256": "3192d6deafed620132da1acd7c68499e163c814bc2be988a3eb2c5302764a30a", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-arm64" + "file": "buildx-v0.31.1.linux-arm64", + "sha256": "963c674c558dad2eefd42304a09020329a196ed16819b72396e7657eb69f031b", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.31.0.freebsd-amd64", - "sha256": "4093af8a217fc492409d54b495cb77718a209678aef25f86c64b244fca5c9a34", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.freebsd-amd64" + "file": "buildx-v0.31.1.freebsd-amd64", + "sha256": "14879cb0b2aee144156119260bc6649822ef1b648aea1ef0ee5381daa6bbaca0", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.31.0.freebsd-arm64", - "sha256": "c3d7c338a9c4cfd859094b5a65cbb99bcc76f0ecc8920daa83ecd3b360261f56", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.freebsd-arm64" + "file": "buildx-v0.31.1.freebsd-arm64", + "sha256": "a327ed5ae8d21aad20f0087be5775634a893f85740120edce92b40cc9712cbe2", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.31.0.netbsd-amd64", - "sha256": "72889de9e57a968c611b9cdee8fee9a65b5fd8e4eb98100e7239cf9a747d07bf", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.netbsd-amd64" + "file": "buildx-v0.31.1.netbsd-amd64", + "sha256": "d07ff05ec8b5281fcf282a854247ce07c81794da15198b3731676b184f2c472d", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.31.0.netbsd-arm64", - "sha256": "f8cc61c794c24fb53001514dd63805a703becd3c06ddcdc217f417d5bdb21340", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.netbsd-arm64" + "file": "buildx-v0.31.1.netbsd-arm64", + "sha256": "2d1171b1c907a10dfc2b971256f2a948c249df16d5714c7e646326b9a5ec7604", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.31.0.openbsd-amd64", - "sha256": "32d996e2702e8612d3d6569ce421036e538d5c37f385f4a0dddd450826007a17", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.openbsd-amd64" + "file": "buildx-v0.31.1.openbsd-amd64", + "sha256": "144a1661f9ad5b710e381100dfe30e44747adfd27f217c3bee38c19e2582bfd7", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.31.0.openbsd-arm64", - "sha256": "f810e0b1203f5101f4c84d0f0377b350f90142dc8effb8f0ae3f2714dc80740e", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.openbsd-arm64" + "file": "buildx-v0.31.1.openbsd-arm64", + "sha256": "afbb1619679a7bfd5d427bb851cd4c0361da07f21aaf73d4724a72c0d62833f7", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.31.0.linux-ppc64le", - "sha256": "fe18282ceb82368e3b7fd79277e34d9904dfbfd0318a3c9fa2e4a2ab12f932e6", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-ppc64le" + "file": "buildx-v0.31.1.linux-ppc64le", + "sha256": "67016c06ceaaf076f852f07f6172f0edc6d71fb6f1436664f9877db68e2ffcfe", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.31.0.linux-riscv64", - "sha256": "bb01f095fb6b3734e352c4f58b7ef294f054d990c899fbfcaf5aa3fe1efbd83c", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-riscv64" + "file": "buildx-v0.31.1.linux-riscv64", + "sha256": "20ad44615fa09af8eccad4014040c0b59d5c83192337be0bd293b2cf732f606f", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.31.0.linux-s390x", - "sha256": "b03b64ab619c073edbaa310d83f275c52b7380abf080d35ea936696eab42aba1", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.linux-s390x" + "file": "buildx-v0.31.1.linux-s390x", + "sha256": "759b12386f3ec701b4255986193d339fad3093033d4786caab04bbdb9cc0d10a", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.31.0.windows-amd64.exe", - "sha256": "4718e18d07e96b87c21ad7a025d21ac1b5d2caf91448c864623dbd2f778fd192", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-amd64.exe" + "file": "buildx-v0.31.1.windows-amd64.exe", + "sha256": "b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.31.0.windows-arm64.exe", - "sha256": "a261a1a5c1fedcc937c7db96234bab0ad0e7e0d5578815520b574dcb505e76d3", - "url": "https://github.com/docker/buildx/releases/download/v0.31.0/buildx-v0.31.0.windows-arm64.exe" + "file": "buildx-v0.31.1.windows-arm64.exe", + "sha256": "531578169b3bc7fade2305afbbe0f6baf22bbed14cea2cf7f21f3db9dfcd4d15", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-arm64.exe" } }, - "version": "0.31.0" + "version": "0.31.1" }, "compose": { "arches": { From 60b6dd3d700a8be36a0d7fb470636aba88498882 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 2 Feb 2026 16:04:14 -0800 Subject: [PATCH 574/667] Update 29 to 29.2.1 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 89daa12c2..5166a1810 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.2.0 +ENV DOCKER_VERSION 29.2.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.2.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.2.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.2.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.2.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index b7aee1f54..5b164c09b 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.2.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.2.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 639534ad8..8ef12e50a 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.2.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.2.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.2.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.2.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.2.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 2e5750769..3b701e664 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.2.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.2.0.zip +ENV DOCKER_VERSION 29.2.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.2.1.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 581478dca..26e6916ec 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.2.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.2.0.zip +ENV DOCKER_VERSION 29.2.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.2.1.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/versions.json b/versions.json index 02cfd6a9c..4cc0033f2 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.2.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.2.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.2.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.2.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.2.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.2.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.2.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.2.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.2.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.2.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.2.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.2.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.2.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.2.1.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.2.0" + "version": "29.2.1" }, "29-rc": null } From 61e5eb275f8f4bb9422a37140e7c9e394210753c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 24 Feb 2026 14:04:15 -0800 Subject: [PATCH 575/667] Update 29 to compose 5.1.0 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 5166a1810..9cc57f61c 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.0.2 +ENV DOCKER_COMPOSE_VERSION 5.1.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-x86_64'; \ - sha256='2d880f723d3da7c779c54fdaea91a842fca8af55d1397f1ed8d7cbab3dd7af67'; \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-x86_64'; \ + sha256='5633cb21e06a7c88c7ca48a9334d3d0f7f892e9605ae9e9a45f9a095d4ffceb8'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv6'; \ - sha256='6618f69bff2b9d2119164e4b44038e1b049c3cc9db39d49f8560db254b0a24b7'; \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv6'; \ + sha256='14159a5fde026633a7d436d6f61979351296a6c24921c009900ff6fb289dd097'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv7'; \ - sha256='d9a0742638f15bd91598ce465cca8718490d967cfb1a28305c388f214d09976b'; \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv7'; \ + sha256='364a8f6d32daa9c4343c5335451af9b7f9531d9079f9621d6800c6c60eb438a1'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-aarch64'; \ - sha256='ac7810e0cd56a5b58576688196fafa843e07e8241fb91018a736d549ea20a3f3'; \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-aarch64'; \ + sha256='da671ae15b4d7c68c38b572a2e9ceba89f09657d2682c2d2e34ad6db828e7442'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-ppc64le'; \ - sha256='1e7ff60971411ffba30208c24c6f0988f8589b9d7bf7783c42f229e95f0648c3'; \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-ppc64le'; \ + sha256='074fe8a082415c84d37a11c325808c2f4aa35e1ed3b15e3fd676feb85480ee59'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-riscv64'; \ - sha256='745cc32f394cd68bb4f09124c43d5d4532277859b6c92efab619722af6eac686'; \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-riscv64'; \ + sha256='f09c0fe479a22563ab70a87ff09611a0da66a02b29bc97926bbc926e6ea27cea'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-s390x'; \ - sha256='d5a9fb6b035cf040fceecccca4892cf55f291e9bf1bb7dd5eb089923bc6e0aac'; \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-s390x'; \ + sha256='6a5c638f7c3b2cacd87eda50af1b98474950d38ea094308a370c7fa3db10c47c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 3b701e664..c259a7fab 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49 +ENV DOCKER_COMPOSE_VERSION 5.1.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 26e6916ec..f7f74cc67 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.0.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49 +ENV DOCKER_COMPOSE_VERSION 5.1.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 4cc0033f2..5148dd1b7 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "2d880f723d3da7c779c54fdaea91a842fca8af55d1397f1ed8d7cbab3dd7af67", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-x86_64" + "sha256": "5633cb21e06a7c88c7ca48a9334d3d0f7f892e9605ae9e9a45f9a095d4ffceb8", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "6618f69bff2b9d2119164e4b44038e1b049c3cc9db39d49f8560db254b0a24b7", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv6" + "sha256": "14159a5fde026633a7d436d6f61979351296a6c24921c009900ff6fb289dd097", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d9a0742638f15bd91598ce465cca8718490d967cfb1a28305c388f214d09976b", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-armv7" + "sha256": "364a8f6d32daa9c4343c5335451af9b7f9531d9079f9621d6800c6c60eb438a1", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "ac7810e0cd56a5b58576688196fafa843e07e8241fb91018a736d549ea20a3f3", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-aarch64" + "sha256": "da671ae15b4d7c68c38b572a2e9ceba89f09657d2682c2d2e34ad6db828e7442", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "766d6f9b305d89c3b8fe88cb6fb207fd7f531fbd63982b6136d058c1f98767bd", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-darwin-x86_64" + "sha256": "726cc96f92a8c0e4ca4484405271a1e16c09eb6dd6754ad5a33bcaf96486e0a9", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "72c7e684a1944cfb1765358d7ea7822cd209f25208ca235b914e761d9abb224e", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-darwin-aarch64" + "sha256": "100d5ed84adc51786b17b450e896f1c410624e1b9f1595cf51df9080009d3788", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "1e7ff60971411ffba30208c24c6f0988f8589b9d7bf7783c42f229e95f0648c3", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-ppc64le" + "sha256": "074fe8a082415c84d37a11c325808c2f4aa35e1ed3b15e3fd676feb85480ee59", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "745cc32f394cd68bb4f09124c43d5d4532277859b6c92efab619722af6eac686", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-riscv64" + "sha256": "f09c0fe479a22563ab70a87ff09611a0da66a02b29bc97926bbc926e6ea27cea", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "d5a9fb6b035cf040fceecccca4892cf55f291e9bf1bb7dd5eb089923bc6e0aac", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-linux-s390x" + "sha256": "6a5c638f7c3b2cacd87eda50af1b98474950d38ea094308a370c7fa3db10c47c", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e6281c7b906eafe8f39114e735f11fc276d8cce2cba93a54911ca15337ba6c49", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-x86_64.exe" + "sha256": "ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "275cbbdebb053bac7a87808cff75a24db6e3c6b069eb76715b7a63cfd9fbb07e", - "url": "https://github.com/docker/compose/releases/download/v5.0.2/docker-compose-windows-aarch64.exe" + "sha256": "3f3dd613a410f7060f3cb806f8a35602b27b8c6b62548e87cb20bd27b765b2ea", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-aarch64.exe" } }, - "version": "5.0.2" + "version": "5.1.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 51def880960994fbee13fbba8c866684c85debe3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 27 Feb 2026 14:04:22 -0800 Subject: [PATCH 576/667] Update 29-rc to 29.3.0-rc.1, buildx 0.31.1, compose 5.1.0 --- 29-rc/cli/Dockerfile | 167 ++++++++++++ 29-rc/cli/docker-entrypoint.sh | 61 +++++ 29-rc/cli/modprobe.sh | 20 ++ 29-rc/dind-rootless/Dockerfile | 55 ++++ 29-rc/dind/Dockerfile | 108 ++++++++ 29-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 171 ++++++++++++- 9 files changed, 1001 insertions(+), 1 deletion(-) create mode 100644 29-rc/cli/Dockerfile create mode 100755 29-rc/cli/docker-entrypoint.sh create mode 100755 29-rc/cli/modprobe.sh create mode 100644 29-rc/dind-rootless/Dockerfile create mode 100644 29-rc/dind/Dockerfile create mode 100755 29-rc/dind/dockerd-entrypoint.sh create mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile new file mode 100644 index 000000000..28d46bdf0 --- /dev/null +++ b/29-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.23 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 29.3.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.3.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.3.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.3.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.3.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.31.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-amd64'; \ + sha256='dc8eaffbf29138123b4874d852522b12303c61246a5073fa0f025e4220317b1e'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v6'; \ + sha256='0b661aa682eb421fb497e080b02f58357bc1f1e83744ffc6fb8de2671f330e93'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v7'; \ + sha256='9a3cd7007611be95608a623b01ce9749b667450bf57f756e112770eeaa3cde8b'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm64'; \ + sha256='963c674c558dad2eefd42304a09020329a196ed16819b72396e7657eb69f031b'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-ppc64le'; \ + sha256='67016c06ceaaf076f852f07f6172f0edc6d71fb6f1436664f9877db68e2ffcfe'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-riscv64'; \ + sha256='20ad44615fa09af8eccad4014040c0b59d5c83192337be0bd293b2cf732f606f'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-s390x'; \ + sha256='759b12386f3ec701b4255986193d339fad3093033d4786caab04bbdb9cc0d10a'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 5.1.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-x86_64'; \ + sha256='5633cb21e06a7c88c7ca48a9334d3d0f7f892e9605ae9e9a45f9a095d4ffceb8'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv6'; \ + sha256='14159a5fde026633a7d436d6f61979351296a6c24921c009900ff6fb289dd097'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv7'; \ + sha256='364a8f6d32daa9c4343c5335451af9b7f9531d9079f9621d6800c6c60eb438a1'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-aarch64'; \ + sha256='da671ae15b4d7c68c38b572a2e9ceba89f09657d2682c2d2e34ad6db828e7442'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-ppc64le'; \ + sha256='074fe8a082415c84d37a11c325808c2f4aa35e1ed3b15e3fd676feb85480ee59'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-riscv64'; \ + sha256='f09c0fe479a22563ab70a87ff09611a0da66a02b29bc97926bbc926e6ea27cea'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-s390x'; \ + sha256='6a5c638f7c3b2cacd87eda50af1b98474950d38ea094308a370c7fa3db10c47c'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/29-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/29-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..1d98c2c48 --- /dev/null +++ b/29-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-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 +# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.3.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.3.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile new file mode 100644 index 000000000..5f0733eee --- /dev/null +++ b/29-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.23&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.3.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.3.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.3.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.3.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..8a291dfa5 --- /dev/null +++ b/29-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..e3c93ad53 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.3.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.3.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.31.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.1.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..ab4e15790 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.3.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.3.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.31.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.1.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 5148dd1b7..ee29cacca 100644 --- a/versions.json +++ b/versions.json @@ -169,5 +169,174 @@ ], "version": "29.2.1" }, - "29-rc": null + "29-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.3.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.3.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.3.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.3.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.3.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.3.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.3.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.31.1.linux-amd64", + "sha256": "dc8eaffbf29138123b4874d852522b12303c61246a5073fa0f025e4220317b1e", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.31.1.linux-arm-v6", + "sha256": "0b661aa682eb421fb497e080b02f58357bc1f1e83744ffc6fb8de2671f330e93", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.31.1.linux-arm-v7", + "sha256": "9a3cd7007611be95608a623b01ce9749b667450bf57f756e112770eeaa3cde8b", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.31.1.linux-arm64", + "sha256": "963c674c558dad2eefd42304a09020329a196ed16819b72396e7657eb69f031b", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.31.1.freebsd-amd64", + "sha256": "14879cb0b2aee144156119260bc6649822ef1b648aea1ef0ee5381daa6bbaca0", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.31.1.freebsd-arm64", + "sha256": "a327ed5ae8d21aad20f0087be5775634a893f85740120edce92b40cc9712cbe2", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.31.1.netbsd-amd64", + "sha256": "d07ff05ec8b5281fcf282a854247ce07c81794da15198b3731676b184f2c472d", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.31.1.netbsd-arm64", + "sha256": "2d1171b1c907a10dfc2b971256f2a948c249df16d5714c7e646326b9a5ec7604", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.31.1.openbsd-amd64", + "sha256": "144a1661f9ad5b710e381100dfe30e44747adfd27f217c3bee38c19e2582bfd7", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.31.1.openbsd-arm64", + "sha256": "afbb1619679a7bfd5d427bb851cd4c0361da07f21aaf73d4724a72c0d62833f7", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.31.1.linux-ppc64le", + "sha256": "67016c06ceaaf076f852f07f6172f0edc6d71fb6f1436664f9877db68e2ffcfe", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.31.1.linux-riscv64", + "sha256": "20ad44615fa09af8eccad4014040c0b59d5c83192337be0bd293b2cf732f606f", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.31.1.linux-s390x", + "sha256": "759b12386f3ec701b4255986193d339fad3093033d4786caab04bbdb9cc0d10a", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.31.1.windows-amd64.exe", + "sha256": "b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.31.1.windows-arm64.exe", + "sha256": "531578169b3bc7fade2305afbbe0f6baf22bbed14cea2cf7f21f3db9dfcd4d15", + "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-arm64.exe" + } + }, + "version": "0.31.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "5633cb21e06a7c88c7ca48a9334d3d0f7f892e9605ae9e9a45f9a095d4ffceb8", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "14159a5fde026633a7d436d6f61979351296a6c24921c009900ff6fb289dd097", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "364a8f6d32daa9c4343c5335451af9b7f9531d9079f9621d6800c6c60eb438a1", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "da671ae15b4d7c68c38b572a2e9ceba89f09657d2682c2d2e34ad6db828e7442", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "726cc96f92a8c0e4ca4484405271a1e16c09eb6dd6754ad5a33bcaf96486e0a9", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "100d5ed84adc51786b17b450e896f1c410624e1b9f1595cf51df9080009d3788", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "074fe8a082415c84d37a11c325808c2f4aa35e1ed3b15e3fd676feb85480ee59", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "f09c0fe479a22563ab70a87ff09611a0da66a02b29bc97926bbc926e6ea27cea", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "6a5c638f7c3b2cacd87eda50af1b98474950d38ea094308a370c7fa3db10c47c", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "3f3dd613a410f7060f3cb806f8a35602b27b8c6b62548e87cb20bd27b765b2ea", + "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-aarch64.exe" + } + }, + "version": "5.1.0" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "29.3.0-rc.1" + } } From 5c0e1d86b02ffb5a5230302e374cd8c507a12b94 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 3 Mar 2026 20:04:12 -0800 Subject: [PATCH 577/667] Update 29 to buildx 0.32.0 --- 29/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 9cc57f61c..42513d673 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.31.1 +ENV DOCKER_BUILDX_VERSION 0.32.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-amd64'; \ - sha256='dc8eaffbf29138123b4874d852522b12303c61246a5073fa0f025e4220317b1e'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-amd64'; \ + sha256='1cdd7b29429bb97796ce9b76330412aa1e6f8627b9b12a4c53d556f6fee59c93'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v6'; \ - sha256='0b661aa682eb421fb497e080b02f58357bc1f1e83744ffc6fb8de2671f330e93'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v6'; \ + sha256='e8ec8bcf196bc216bea143c881fe901e5528bc702f2df0ecbf5e2c5e34ceeb8c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v7'; \ - sha256='9a3cd7007611be95608a623b01ce9749b667450bf57f756e112770eeaa3cde8b'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v7'; \ + sha256='2c0b2c1620cf2be32e50f400e158fb990d79ac89874424efcc84ec9f42d62d94'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm64'; \ - sha256='963c674c558dad2eefd42304a09020329a196ed16819b72396e7657eb69f031b'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm64'; \ + sha256='cd0690b2d1b91ec9b799c34340e4ca8456845f5c053ef38775388290369aace1'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-ppc64le'; \ - sha256='67016c06ceaaf076f852f07f6172f0edc6d71fb6f1436664f9877db68e2ffcfe'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-ppc64le'; \ + sha256='d789a313105446d4e2d6c6960c30afa77d6ee045439add094cb473dcfa82080f'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-riscv64'; \ - sha256='20ad44615fa09af8eccad4014040c0b59d5c83192337be0bd293b2cf732f606f'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-riscv64'; \ + sha256='04807647bb98c447ea6c886ed492219e7b4f0ecce9deaf10ed5b023eef2cd7d9'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-s390x'; \ - sha256='759b12386f3ec701b4255986193d339fad3093033d4786caab04bbdb9cc0d10a'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-s390x'; \ + sha256='0ac991909daa167894b2a9a9c775c1d66f8246835543c3eb86ec80d0f621788e'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index c259a7fab..4b12069a6 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.31.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a +ENV DOCKER_BUILDX_VERSION 0.32.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index f7f74cc67..f65f63506 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.31.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a +ENV DOCKER_BUILDX_VERSION 0.32.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ee29cacca..22ec4b353 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.31.1.linux-amd64", - "sha256": "dc8eaffbf29138123b4874d852522b12303c61246a5073fa0f025e4220317b1e", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-amd64" + "file": "buildx-v0.32.0.linux-amd64", + "sha256": "1cdd7b29429bb97796ce9b76330412aa1e6f8627b9b12a4c53d556f6fee59c93", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.31.1.linux-arm-v6", - "sha256": "0b661aa682eb421fb497e080b02f58357bc1f1e83744ffc6fb8de2671f330e93", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v6" + "file": "buildx-v0.32.0.linux-arm-v6", + "sha256": "e8ec8bcf196bc216bea143c881fe901e5528bc702f2df0ecbf5e2c5e34ceeb8c", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.31.1.linux-arm-v7", - "sha256": "9a3cd7007611be95608a623b01ce9749b667450bf57f756e112770eeaa3cde8b", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v7" + "file": "buildx-v0.32.0.linux-arm-v7", + "sha256": "2c0b2c1620cf2be32e50f400e158fb990d79ac89874424efcc84ec9f42d62d94", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.31.1.linux-arm64", - "sha256": "963c674c558dad2eefd42304a09020329a196ed16819b72396e7657eb69f031b", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm64" + "file": "buildx-v0.32.0.linux-arm64", + "sha256": "cd0690b2d1b91ec9b799c34340e4ca8456845f5c053ef38775388290369aace1", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.31.1.freebsd-amd64", - "sha256": "14879cb0b2aee144156119260bc6649822ef1b648aea1ef0ee5381daa6bbaca0", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.freebsd-amd64" + "file": "buildx-v0.32.0.freebsd-amd64", + "sha256": "f657f586515f1a9b0264362fc300121ab85a8ed0da9409729d16623232e085d8", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.31.1.freebsd-arm64", - "sha256": "a327ed5ae8d21aad20f0087be5775634a893f85740120edce92b40cc9712cbe2", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.freebsd-arm64" + "file": "buildx-v0.32.0.freebsd-arm64", + "sha256": "3ba89dfc512584653a226233ecd3f2795c5d78a6cf5afd7248b20dba50029f3a", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.31.1.netbsd-amd64", - "sha256": "d07ff05ec8b5281fcf282a854247ce07c81794da15198b3731676b184f2c472d", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.netbsd-amd64" + "file": "buildx-v0.32.0.netbsd-amd64", + "sha256": "7424b60db97f5c159cd4ee19631f00289be0ff5656643a9dd60da62774015cbc", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.31.1.netbsd-arm64", - "sha256": "2d1171b1c907a10dfc2b971256f2a948c249df16d5714c7e646326b9a5ec7604", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.netbsd-arm64" + "file": "buildx-v0.32.0.netbsd-arm64", + "sha256": "6d1a3f9845019f8385dec685161d4ab28859088716f68a25461b9f2821b4023f", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.31.1.openbsd-amd64", - "sha256": "144a1661f9ad5b710e381100dfe30e44747adfd27f217c3bee38c19e2582bfd7", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.openbsd-amd64" + "file": "buildx-v0.32.0.openbsd-amd64", + "sha256": "83eb56527f3039738b53a932704e22108c720e009dd3b12e45552f1920835349", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.31.1.openbsd-arm64", - "sha256": "afbb1619679a7bfd5d427bb851cd4c0361da07f21aaf73d4724a72c0d62833f7", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.openbsd-arm64" + "file": "buildx-v0.32.0.openbsd-arm64", + "sha256": "11a6719029259db4eb0b6d369c91a71a99d8ce7146d45b88e7b4d4b3679be70c", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.31.1.linux-ppc64le", - "sha256": "67016c06ceaaf076f852f07f6172f0edc6d71fb6f1436664f9877db68e2ffcfe", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-ppc64le" + "file": "buildx-v0.32.0.linux-ppc64le", + "sha256": "d789a313105446d4e2d6c6960c30afa77d6ee045439add094cb473dcfa82080f", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.31.1.linux-riscv64", - "sha256": "20ad44615fa09af8eccad4014040c0b59d5c83192337be0bd293b2cf732f606f", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-riscv64" + "file": "buildx-v0.32.0.linux-riscv64", + "sha256": "04807647bb98c447ea6c886ed492219e7b4f0ecce9deaf10ed5b023eef2cd7d9", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.31.1.linux-s390x", - "sha256": "759b12386f3ec701b4255986193d339fad3093033d4786caab04bbdb9cc0d10a", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-s390x" + "file": "buildx-v0.32.0.linux-s390x", + "sha256": "0ac991909daa167894b2a9a9c775c1d66f8246835543c3eb86ec80d0f621788e", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.31.1.windows-amd64.exe", - "sha256": "b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe" + "file": "buildx-v0.32.0.windows-amd64.exe", + "sha256": "d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.31.1.windows-arm64.exe", - "sha256": "531578169b3bc7fade2305afbbe0f6baf22bbed14cea2cf7f21f3db9dfcd4d15", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-arm64.exe" + "file": "buildx-v0.32.0.windows-arm64.exe", + "sha256": "c952e2ea8b8930cf448c08423b1767b8640c9181bde51afed43b6f0b0bf727f0", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-arm64.exe" } }, - "version": "0.31.1" + "version": "0.32.0" }, "compose": { "arches": { From 1e25d71c8565e50649e7b57eb0552992fbe89f9a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 3 Mar 2026 20:05:57 -0800 Subject: [PATCH 578/667] Update 29-rc to buildx 0.32.0 --- 29-rc/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 28d46bdf0..d396967c8 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.31.1 +ENV DOCKER_BUILDX_VERSION 0.32.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-amd64'; \ - sha256='dc8eaffbf29138123b4874d852522b12303c61246a5073fa0f025e4220317b1e'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-amd64'; \ + sha256='1cdd7b29429bb97796ce9b76330412aa1e6f8627b9b12a4c53d556f6fee59c93'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v6'; \ - sha256='0b661aa682eb421fb497e080b02f58357bc1f1e83744ffc6fb8de2671f330e93'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v6'; \ + sha256='e8ec8bcf196bc216bea143c881fe901e5528bc702f2df0ecbf5e2c5e34ceeb8c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v7'; \ - sha256='9a3cd7007611be95608a623b01ce9749b667450bf57f756e112770eeaa3cde8b'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v7'; \ + sha256='2c0b2c1620cf2be32e50f400e158fb990d79ac89874424efcc84ec9f42d62d94'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm64'; \ - sha256='963c674c558dad2eefd42304a09020329a196ed16819b72396e7657eb69f031b'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm64'; \ + sha256='cd0690b2d1b91ec9b799c34340e4ca8456845f5c053ef38775388290369aace1'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-ppc64le'; \ - sha256='67016c06ceaaf076f852f07f6172f0edc6d71fb6f1436664f9877db68e2ffcfe'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-ppc64le'; \ + sha256='d789a313105446d4e2d6c6960c30afa77d6ee045439add094cb473dcfa82080f'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-riscv64'; \ - sha256='20ad44615fa09af8eccad4014040c0b59d5c83192337be0bd293b2cf732f606f'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-riscv64'; \ + sha256='04807647bb98c447ea6c886ed492219e7b4f0ecce9deaf10ed5b023eef2cd7d9'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-s390x'; \ - sha256='759b12386f3ec701b4255986193d339fad3093033d4786caab04bbdb9cc0d10a'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-s390x'; \ + sha256='0ac991909daa167894b2a9a9c775c1d66f8246835543c3eb86ec80d0f621788e'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index e3c93ad53..e9e27ac20 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.31.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a +ENV DOCKER_BUILDX_VERSION 0.32.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index ab4e15790..e53b240bb 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.31.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a +ENV DOCKER_BUILDX_VERSION 0.32.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 22ec4b353..21e701053 100644 --- a/versions.json +++ b/versions.json @@ -192,82 +192,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.31.1.linux-amd64", - "sha256": "dc8eaffbf29138123b4874d852522b12303c61246a5073fa0f025e4220317b1e", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-amd64" + "file": "buildx-v0.32.0.linux-amd64", + "sha256": "1cdd7b29429bb97796ce9b76330412aa1e6f8627b9b12a4c53d556f6fee59c93", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.31.1.linux-arm-v6", - "sha256": "0b661aa682eb421fb497e080b02f58357bc1f1e83744ffc6fb8de2671f330e93", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v6" + "file": "buildx-v0.32.0.linux-arm-v6", + "sha256": "e8ec8bcf196bc216bea143c881fe901e5528bc702f2df0ecbf5e2c5e34ceeb8c", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.31.1.linux-arm-v7", - "sha256": "9a3cd7007611be95608a623b01ce9749b667450bf57f756e112770eeaa3cde8b", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm-v7" + "file": "buildx-v0.32.0.linux-arm-v7", + "sha256": "2c0b2c1620cf2be32e50f400e158fb990d79ac89874424efcc84ec9f42d62d94", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.31.1.linux-arm64", - "sha256": "963c674c558dad2eefd42304a09020329a196ed16819b72396e7657eb69f031b", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-arm64" + "file": "buildx-v0.32.0.linux-arm64", + "sha256": "cd0690b2d1b91ec9b799c34340e4ca8456845f5c053ef38775388290369aace1", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.31.1.freebsd-amd64", - "sha256": "14879cb0b2aee144156119260bc6649822ef1b648aea1ef0ee5381daa6bbaca0", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.freebsd-amd64" + "file": "buildx-v0.32.0.freebsd-amd64", + "sha256": "f657f586515f1a9b0264362fc300121ab85a8ed0da9409729d16623232e085d8", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.31.1.freebsd-arm64", - "sha256": "a327ed5ae8d21aad20f0087be5775634a893f85740120edce92b40cc9712cbe2", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.freebsd-arm64" + "file": "buildx-v0.32.0.freebsd-arm64", + "sha256": "3ba89dfc512584653a226233ecd3f2795c5d78a6cf5afd7248b20dba50029f3a", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.31.1.netbsd-amd64", - "sha256": "d07ff05ec8b5281fcf282a854247ce07c81794da15198b3731676b184f2c472d", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.netbsd-amd64" + "file": "buildx-v0.32.0.netbsd-amd64", + "sha256": "7424b60db97f5c159cd4ee19631f00289be0ff5656643a9dd60da62774015cbc", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.31.1.netbsd-arm64", - "sha256": "2d1171b1c907a10dfc2b971256f2a948c249df16d5714c7e646326b9a5ec7604", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.netbsd-arm64" + "file": "buildx-v0.32.0.netbsd-arm64", + "sha256": "6d1a3f9845019f8385dec685161d4ab28859088716f68a25461b9f2821b4023f", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.31.1.openbsd-amd64", - "sha256": "144a1661f9ad5b710e381100dfe30e44747adfd27f217c3bee38c19e2582bfd7", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.openbsd-amd64" + "file": "buildx-v0.32.0.openbsd-amd64", + "sha256": "83eb56527f3039738b53a932704e22108c720e009dd3b12e45552f1920835349", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.31.1.openbsd-arm64", - "sha256": "afbb1619679a7bfd5d427bb851cd4c0361da07f21aaf73d4724a72c0d62833f7", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.openbsd-arm64" + "file": "buildx-v0.32.0.openbsd-arm64", + "sha256": "11a6719029259db4eb0b6d369c91a71a99d8ce7146d45b88e7b4d4b3679be70c", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.31.1.linux-ppc64le", - "sha256": "67016c06ceaaf076f852f07f6172f0edc6d71fb6f1436664f9877db68e2ffcfe", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-ppc64le" + "file": "buildx-v0.32.0.linux-ppc64le", + "sha256": "d789a313105446d4e2d6c6960c30afa77d6ee045439add094cb473dcfa82080f", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.31.1.linux-riscv64", - "sha256": "20ad44615fa09af8eccad4014040c0b59d5c83192337be0bd293b2cf732f606f", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-riscv64" + "file": "buildx-v0.32.0.linux-riscv64", + "sha256": "04807647bb98c447ea6c886ed492219e7b4f0ecce9deaf10ed5b023eef2cd7d9", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.31.1.linux-s390x", - "sha256": "759b12386f3ec701b4255986193d339fad3093033d4786caab04bbdb9cc0d10a", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.linux-s390x" + "file": "buildx-v0.32.0.linux-s390x", + "sha256": "0ac991909daa167894b2a9a9c775c1d66f8246835543c3eb86ec80d0f621788e", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.31.1.windows-amd64.exe", - "sha256": "b49832d4ac46bde05006f7ad3506b9d5060b60e5c566545d8e10c1a80df08a4a", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-amd64.exe" + "file": "buildx-v0.32.0.windows-amd64.exe", + "sha256": "d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.31.1.windows-arm64.exe", - "sha256": "531578169b3bc7fade2305afbbe0f6baf22bbed14cea2cf7f21f3db9dfcd4d15", - "url": "https://github.com/docker/buildx/releases/download/v0.31.1/buildx-v0.31.1.windows-arm64.exe" + "file": "buildx-v0.32.0.windows-arm64.exe", + "sha256": "c952e2ea8b8930cf448c08423b1767b8640c9181bde51afed43b6f0b0bf727f0", + "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-arm64.exe" } }, - "version": "0.31.1" + "version": "0.32.0" }, "compose": { "arches": { From 4a910c55c3990460140975301937d1a767e04175 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 4 Mar 2026 14:04:12 -0800 Subject: [PATCH 579/667] Update 29 to buildx 0.32.1 --- 29/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 42513d673..d9a2e9b25 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.32.0 +ENV DOCKER_BUILDX_VERSION 0.32.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-amd64'; \ - sha256='1cdd7b29429bb97796ce9b76330412aa1e6f8627b9b12a4c53d556f6fee59c93'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-amd64'; \ + sha256='2bbc1b8ebc9a05287b01bc2fe6633ec5e2f53d58ee955ae69756d668e7098e5e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v6'; \ - sha256='e8ec8bcf196bc216bea143c881fe901e5528bc702f2df0ecbf5e2c5e34ceeb8c'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v6'; \ + sha256='545d2b678e9a494e0891526ee4977699132c16659c8b3c25a4be8484cf19f691'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v7'; \ - sha256='2c0b2c1620cf2be32e50f400e158fb990d79ac89874424efcc84ec9f42d62d94'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v7'; \ + sha256='c3abd2992c0cbef5d307ec59d490f65c563008798a6b01a85a82069ad9945aad'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm64'; \ - sha256='cd0690b2d1b91ec9b799c34340e4ca8456845f5c053ef38775388290369aace1'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm64'; \ + sha256='f03767cb0149759d409cd600b915bce764175ffda6eb3e86e14cc84a5637176a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-ppc64le'; \ - sha256='d789a313105446d4e2d6c6960c30afa77d6ee045439add094cb473dcfa82080f'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-ppc64le'; \ + sha256='7d6428c784d5665e846d533c8ae2309942cbc5ef2fa82c5d2c20a9cdd2aa9609'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-riscv64'; \ - sha256='04807647bb98c447ea6c886ed492219e7b4f0ecce9deaf10ed5b023eef2cd7d9'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-riscv64'; \ + sha256='ff29d3ad8756d11c2fdfddf068d794615d52a2b052b0e2e50edbdbeaf11cbe42'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-s390x'; \ - sha256='0ac991909daa167894b2a9a9c775c1d66f8246835543c3eb86ec80d0f621788e'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-s390x'; \ + sha256='f3e5e960ce35f16c592354e9d6a704f206550d92292c850f193c1af5289b60e5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 4b12069a6..96d676ee7 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.32.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a +ENV DOCKER_BUILDX_VERSION 0.32.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index f65f63506..c9abfdbba 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.32.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a +ENV DOCKER_BUILDX_VERSION 0.32.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 21e701053..be1434d25 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.32.0.linux-amd64", - "sha256": "1cdd7b29429bb97796ce9b76330412aa1e6f8627b9b12a4c53d556f6fee59c93", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-amd64" + "file": "buildx-v0.32.1.linux-amd64", + "sha256": "2bbc1b8ebc9a05287b01bc2fe6633ec5e2f53d58ee955ae69756d668e7098e5e", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.32.0.linux-arm-v6", - "sha256": "e8ec8bcf196bc216bea143c881fe901e5528bc702f2df0ecbf5e2c5e34ceeb8c", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v6" + "file": "buildx-v0.32.1.linux-arm-v6", + "sha256": "545d2b678e9a494e0891526ee4977699132c16659c8b3c25a4be8484cf19f691", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.32.0.linux-arm-v7", - "sha256": "2c0b2c1620cf2be32e50f400e158fb990d79ac89874424efcc84ec9f42d62d94", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v7" + "file": "buildx-v0.32.1.linux-arm-v7", + "sha256": "c3abd2992c0cbef5d307ec59d490f65c563008798a6b01a85a82069ad9945aad", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.32.0.linux-arm64", - "sha256": "cd0690b2d1b91ec9b799c34340e4ca8456845f5c053ef38775388290369aace1", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm64" + "file": "buildx-v0.32.1.linux-arm64", + "sha256": "f03767cb0149759d409cd600b915bce764175ffda6eb3e86e14cc84a5637176a", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.32.0.freebsd-amd64", - "sha256": "f657f586515f1a9b0264362fc300121ab85a8ed0da9409729d16623232e085d8", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.freebsd-amd64" + "file": "buildx-v0.32.1.freebsd-amd64", + "sha256": "514154a7f1881a7b6b8a317ac5d3e0c38f2df744d5e6893617d3ee9b32a621ba", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.32.0.freebsd-arm64", - "sha256": "3ba89dfc512584653a226233ecd3f2795c5d78a6cf5afd7248b20dba50029f3a", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.freebsd-arm64" + "file": "buildx-v0.32.1.freebsd-arm64", + "sha256": "bd7f854de556e44162cc7ed87f0aebda6a31c623fc9cb2fd3c37a8eee21c1b55", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.32.0.netbsd-amd64", - "sha256": "7424b60db97f5c159cd4ee19631f00289be0ff5656643a9dd60da62774015cbc", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.netbsd-amd64" + "file": "buildx-v0.32.1.netbsd-amd64", + "sha256": "391c32fac3255687532b245aeda6a2ad34d284ae97d23b34b3c505e639111254", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.32.0.netbsd-arm64", - "sha256": "6d1a3f9845019f8385dec685161d4ab28859088716f68a25461b9f2821b4023f", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.netbsd-arm64" + "file": "buildx-v0.32.1.netbsd-arm64", + "sha256": "1dbec61b5441125161855561ad06fca1b523c0292b5badde432644b894162e95", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.32.0.openbsd-amd64", - "sha256": "83eb56527f3039738b53a932704e22108c720e009dd3b12e45552f1920835349", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.openbsd-amd64" + "file": "buildx-v0.32.1.openbsd-amd64", + "sha256": "3d0d66e62430ee606a43eb6222c0598fc1e5cf414bc903d000ff506703f10119", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.32.0.openbsd-arm64", - "sha256": "11a6719029259db4eb0b6d369c91a71a99d8ce7146d45b88e7b4d4b3679be70c", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.openbsd-arm64" + "file": "buildx-v0.32.1.openbsd-arm64", + "sha256": "7b9a27163853b8dfbaf935fa7526befa90f11a04eb4dad3e72f4c446bee4ddc3", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.32.0.linux-ppc64le", - "sha256": "d789a313105446d4e2d6c6960c30afa77d6ee045439add094cb473dcfa82080f", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-ppc64le" + "file": "buildx-v0.32.1.linux-ppc64le", + "sha256": "7d6428c784d5665e846d533c8ae2309942cbc5ef2fa82c5d2c20a9cdd2aa9609", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.32.0.linux-riscv64", - "sha256": "04807647bb98c447ea6c886ed492219e7b4f0ecce9deaf10ed5b023eef2cd7d9", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-riscv64" + "file": "buildx-v0.32.1.linux-riscv64", + "sha256": "ff29d3ad8756d11c2fdfddf068d794615d52a2b052b0e2e50edbdbeaf11cbe42", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.32.0.linux-s390x", - "sha256": "0ac991909daa167894b2a9a9c775c1d66f8246835543c3eb86ec80d0f621788e", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-s390x" + "file": "buildx-v0.32.1.linux-s390x", + "sha256": "f3e5e960ce35f16c592354e9d6a704f206550d92292c850f193c1af5289b60e5", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.32.0.windows-amd64.exe", - "sha256": "d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe" + "file": "buildx-v0.32.1.windows-amd64.exe", + "sha256": "47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.32.0.windows-arm64.exe", - "sha256": "c952e2ea8b8930cf448c08423b1767b8640c9181bde51afed43b6f0b0bf727f0", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-arm64.exe" + "file": "buildx-v0.32.1.windows-arm64.exe", + "sha256": "a39bb64734f1cf749120ed3c35a7cb9bf886b4ec3b78d3c2e84abf0fb95a0044", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-arm64.exe" } }, - "version": "0.32.0" + "version": "0.32.1" }, "compose": { "arches": { From 4aa8e464316acec1641914f85ef79d5f33ed0fb6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 4 Mar 2026 14:06:04 -0800 Subject: [PATCH 580/667] Update 29-rc to buildx 0.32.1 --- 29-rc/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index d396967c8..eeac9d2b4 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.32.0 +ENV DOCKER_BUILDX_VERSION 0.32.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-amd64'; \ - sha256='1cdd7b29429bb97796ce9b76330412aa1e6f8627b9b12a4c53d556f6fee59c93'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-amd64'; \ + sha256='2bbc1b8ebc9a05287b01bc2fe6633ec5e2f53d58ee955ae69756d668e7098e5e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v6'; \ - sha256='e8ec8bcf196bc216bea143c881fe901e5528bc702f2df0ecbf5e2c5e34ceeb8c'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v6'; \ + sha256='545d2b678e9a494e0891526ee4977699132c16659c8b3c25a4be8484cf19f691'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v7'; \ - sha256='2c0b2c1620cf2be32e50f400e158fb990d79ac89874424efcc84ec9f42d62d94'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v7'; \ + sha256='c3abd2992c0cbef5d307ec59d490f65c563008798a6b01a85a82069ad9945aad'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm64'; \ - sha256='cd0690b2d1b91ec9b799c34340e4ca8456845f5c053ef38775388290369aace1'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm64'; \ + sha256='f03767cb0149759d409cd600b915bce764175ffda6eb3e86e14cc84a5637176a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-ppc64le'; \ - sha256='d789a313105446d4e2d6c6960c30afa77d6ee045439add094cb473dcfa82080f'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-ppc64le'; \ + sha256='7d6428c784d5665e846d533c8ae2309942cbc5ef2fa82c5d2c20a9cdd2aa9609'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-riscv64'; \ - sha256='04807647bb98c447ea6c886ed492219e7b4f0ecce9deaf10ed5b023eef2cd7d9'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-riscv64'; \ + sha256='ff29d3ad8756d11c2fdfddf068d794615d52a2b052b0e2e50edbdbeaf11cbe42'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-s390x'; \ - sha256='0ac991909daa167894b2a9a9c775c1d66f8246835543c3eb86ec80d0f621788e'; \ + url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-s390x'; \ + sha256='f3e5e960ce35f16c592354e9d6a704f206550d92292c850f193c1af5289b60e5'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index e9e27ac20..6cd325248 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.32.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a +ENV DOCKER_BUILDX_VERSION 0.32.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index e53b240bb..7df01cadc 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.32.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a +ENV DOCKER_BUILDX_VERSION 0.32.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index be1434d25..ba81341d2 100644 --- a/versions.json +++ b/versions.json @@ -192,82 +192,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.32.0.linux-amd64", - "sha256": "1cdd7b29429bb97796ce9b76330412aa1e6f8627b9b12a4c53d556f6fee59c93", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-amd64" + "file": "buildx-v0.32.1.linux-amd64", + "sha256": "2bbc1b8ebc9a05287b01bc2fe6633ec5e2f53d58ee955ae69756d668e7098e5e", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.32.0.linux-arm-v6", - "sha256": "e8ec8bcf196bc216bea143c881fe901e5528bc702f2df0ecbf5e2c5e34ceeb8c", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v6" + "file": "buildx-v0.32.1.linux-arm-v6", + "sha256": "545d2b678e9a494e0891526ee4977699132c16659c8b3c25a4be8484cf19f691", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.32.0.linux-arm-v7", - "sha256": "2c0b2c1620cf2be32e50f400e158fb990d79ac89874424efcc84ec9f42d62d94", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm-v7" + "file": "buildx-v0.32.1.linux-arm-v7", + "sha256": "c3abd2992c0cbef5d307ec59d490f65c563008798a6b01a85a82069ad9945aad", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.32.0.linux-arm64", - "sha256": "cd0690b2d1b91ec9b799c34340e4ca8456845f5c053ef38775388290369aace1", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-arm64" + "file": "buildx-v0.32.1.linux-arm64", + "sha256": "f03767cb0149759d409cd600b915bce764175ffda6eb3e86e14cc84a5637176a", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.32.0.freebsd-amd64", - "sha256": "f657f586515f1a9b0264362fc300121ab85a8ed0da9409729d16623232e085d8", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.freebsd-amd64" + "file": "buildx-v0.32.1.freebsd-amd64", + "sha256": "514154a7f1881a7b6b8a317ac5d3e0c38f2df744d5e6893617d3ee9b32a621ba", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.32.0.freebsd-arm64", - "sha256": "3ba89dfc512584653a226233ecd3f2795c5d78a6cf5afd7248b20dba50029f3a", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.freebsd-arm64" + "file": "buildx-v0.32.1.freebsd-arm64", + "sha256": "bd7f854de556e44162cc7ed87f0aebda6a31c623fc9cb2fd3c37a8eee21c1b55", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.32.0.netbsd-amd64", - "sha256": "7424b60db97f5c159cd4ee19631f00289be0ff5656643a9dd60da62774015cbc", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.netbsd-amd64" + "file": "buildx-v0.32.1.netbsd-amd64", + "sha256": "391c32fac3255687532b245aeda6a2ad34d284ae97d23b34b3c505e639111254", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.32.0.netbsd-arm64", - "sha256": "6d1a3f9845019f8385dec685161d4ab28859088716f68a25461b9f2821b4023f", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.netbsd-arm64" + "file": "buildx-v0.32.1.netbsd-arm64", + "sha256": "1dbec61b5441125161855561ad06fca1b523c0292b5badde432644b894162e95", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.32.0.openbsd-amd64", - "sha256": "83eb56527f3039738b53a932704e22108c720e009dd3b12e45552f1920835349", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.openbsd-amd64" + "file": "buildx-v0.32.1.openbsd-amd64", + "sha256": "3d0d66e62430ee606a43eb6222c0598fc1e5cf414bc903d000ff506703f10119", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.32.0.openbsd-arm64", - "sha256": "11a6719029259db4eb0b6d369c91a71a99d8ce7146d45b88e7b4d4b3679be70c", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.openbsd-arm64" + "file": "buildx-v0.32.1.openbsd-arm64", + "sha256": "7b9a27163853b8dfbaf935fa7526befa90f11a04eb4dad3e72f4c446bee4ddc3", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.32.0.linux-ppc64le", - "sha256": "d789a313105446d4e2d6c6960c30afa77d6ee045439add094cb473dcfa82080f", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-ppc64le" + "file": "buildx-v0.32.1.linux-ppc64le", + "sha256": "7d6428c784d5665e846d533c8ae2309942cbc5ef2fa82c5d2c20a9cdd2aa9609", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.32.0.linux-riscv64", - "sha256": "04807647bb98c447ea6c886ed492219e7b4f0ecce9deaf10ed5b023eef2cd7d9", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-riscv64" + "file": "buildx-v0.32.1.linux-riscv64", + "sha256": "ff29d3ad8756d11c2fdfddf068d794615d52a2b052b0e2e50edbdbeaf11cbe42", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.32.0.linux-s390x", - "sha256": "0ac991909daa167894b2a9a9c775c1d66f8246835543c3eb86ec80d0f621788e", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.linux-s390x" + "file": "buildx-v0.32.1.linux-s390x", + "sha256": "f3e5e960ce35f16c592354e9d6a704f206550d92292c850f193c1af5289b60e5", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.32.0.windows-amd64.exe", - "sha256": "d32bc2b7361fdebea93b2af0d321a2f8fc987faf0c90a64d0a860e97d4ade87a", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-amd64.exe" + "file": "buildx-v0.32.1.windows-amd64.exe", + "sha256": "47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.32.0.windows-arm64.exe", - "sha256": "c952e2ea8b8930cf448c08423b1767b8640c9181bde51afed43b6f0b0bf727f0", - "url": "https://github.com/docker/buildx/releases/download/v0.32.0/buildx-v0.32.0.windows-arm64.exe" + "file": "buildx-v0.32.1.windows-arm64.exe", + "sha256": "a39bb64734f1cf749120ed3c35a7cb9bf886b4ec3b78d3c2e84abf0fb95a0044", + "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-arm64.exe" } }, - "version": "0.32.0" + "version": "0.32.1" }, "compose": { "arches": { From 41fd7e84aa8931e6066b04a20e969ca07b60547a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 5 Mar 2026 08:04:13 -0800 Subject: [PATCH 581/667] Update 29 to 29.3.0 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index d9a2e9b25..fdd82d27d 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.2.1 +ENV DOCKER_VERSION 29.3.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.3.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.3.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.3.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.3.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 5b164c09b..fcc7a6d5a 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.3.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.3.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 8ef12e50a..99bdd4b97 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.3.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.3.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.3.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.2.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.3.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 96d676ee7..80631c946 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.2.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.2.1.zip +ENV DOCKER_VERSION 29.3.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.3.0.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index c9abfdbba..ef8084a14 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.2.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.2.1.zip +ENV DOCKER_VERSION 29.3.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.3.0.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/versions.json b/versions.json index ba81341d2..c166e0d31 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.2.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.3.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.3.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.3.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.3.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.2.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.2.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.3.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.3.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.2.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.3.0.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.2.1" + "version": "29.3.0" }, "29-rc": { "arches": { From 2c51bcf6969cf307321f6b4fbe1bd492b96865b8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 5 Mar 2026 08:06:06 -0800 Subject: [PATCH 582/667] Update 29-rc --- 29-rc/cli/Dockerfile | 167 ------------ 29-rc/cli/docker-entrypoint.sh | 61 ----- 29-rc/cli/modprobe.sh | 20 -- 29-rc/dind-rootless/Dockerfile | 55 ---- 29-rc/dind/Dockerfile | 108 -------- 29-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 171 +------------ 9 files changed, 1 insertion(+), 1001 deletions(-) delete mode 100644 29-rc/cli/Dockerfile delete mode 100755 29-rc/cli/docker-entrypoint.sh delete mode 100755 29-rc/cli/modprobe.sh delete mode 100644 29-rc/dind-rootless/Dockerfile delete mode 100644 29-rc/dind/Dockerfile delete mode 100755 29-rc/dind/dockerd-entrypoint.sh delete mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile deleted file mode 100644 index eeac9d2b4..000000000 --- a/29-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.23 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 29.3.0-rc.1 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.3.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.3.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.3.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.3.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.32.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-amd64'; \ - sha256='2bbc1b8ebc9a05287b01bc2fe6633ec5e2f53d58ee955ae69756d668e7098e5e'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v6'; \ - sha256='545d2b678e9a494e0891526ee4977699132c16659c8b3c25a4be8484cf19f691'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v7'; \ - sha256='c3abd2992c0cbef5d307ec59d490f65c563008798a6b01a85a82069ad9945aad'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm64'; \ - sha256='f03767cb0149759d409cd600b915bce764175ffda6eb3e86e14cc84a5637176a'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-ppc64le'; \ - sha256='7d6428c784d5665e846d533c8ae2309942cbc5ef2fa82c5d2c20a9cdd2aa9609'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-riscv64'; \ - sha256='ff29d3ad8756d11c2fdfddf068d794615d52a2b052b0e2e50edbdbeaf11cbe42'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-s390x'; \ - sha256='f3e5e960ce35f16c592354e9d6a704f206550d92292c850f193c1af5289b60e5'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 5.1.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-x86_64'; \ - sha256='5633cb21e06a7c88c7ca48a9334d3d0f7f892e9605ae9e9a45f9a095d4ffceb8'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv6'; \ - sha256='14159a5fde026633a7d436d6f61979351296a6c24921c009900ff6fb289dd097'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv7'; \ - sha256='364a8f6d32daa9c4343c5335451af9b7f9531d9079f9621d6800c6c60eb438a1'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-aarch64'; \ - sha256='da671ae15b4d7c68c38b572a2e9ceba89f09657d2682c2d2e34ad6db828e7442'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-ppc64le'; \ - sha256='074fe8a082415c84d37a11c325808c2f4aa35e1ed3b15e3fd676feb85480ee59'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-riscv64'; \ - sha256='f09c0fe479a22563ab70a87ff09611a0da66a02b29bc97926bbc926e6ea27cea'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-s390x'; \ - sha256='6a5c638f7c3b2cacd87eda50af1b98474950d38ea094308a370c7fa3db10c47c'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/29-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/29-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile deleted file mode 100644 index 1d98c2c48..000000000 --- a/29-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-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 -# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.3.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.3.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile deleted file mode 100644 index 5f0733eee..000000000 --- a/29-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.23&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.3.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.3.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.3.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.3.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 8a291dfa5..000000000 --- a/29-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 6cd325248..000000000 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.3.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.3.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.32.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index 7df01cadc..000000000 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.3.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.3.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.32.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index c166e0d31..facf7854d 100644 --- a/versions.json +++ b/versions.json @@ -169,174 +169,5 @@ ], "version": "29.3.0" }, - "29-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.3.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.3.0-rc.1.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.3.0-rc.1.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.3.0-rc.1.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.3.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.3.0-rc.1.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.3.0-rc.1.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.32.1.linux-amd64", - "sha256": "2bbc1b8ebc9a05287b01bc2fe6633ec5e2f53d58ee955ae69756d668e7098e5e", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.32.1.linux-arm-v6", - "sha256": "545d2b678e9a494e0891526ee4977699132c16659c8b3c25a4be8484cf19f691", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.32.1.linux-arm-v7", - "sha256": "c3abd2992c0cbef5d307ec59d490f65c563008798a6b01a85a82069ad9945aad", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.32.1.linux-arm64", - "sha256": "f03767cb0149759d409cd600b915bce764175ffda6eb3e86e14cc84a5637176a", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.32.1.freebsd-amd64", - "sha256": "514154a7f1881a7b6b8a317ac5d3e0c38f2df744d5e6893617d3ee9b32a621ba", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.32.1.freebsd-arm64", - "sha256": "bd7f854de556e44162cc7ed87f0aebda6a31c623fc9cb2fd3c37a8eee21c1b55", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.32.1.netbsd-amd64", - "sha256": "391c32fac3255687532b245aeda6a2ad34d284ae97d23b34b3c505e639111254", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.32.1.netbsd-arm64", - "sha256": "1dbec61b5441125161855561ad06fca1b523c0292b5badde432644b894162e95", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.32.1.openbsd-amd64", - "sha256": "3d0d66e62430ee606a43eb6222c0598fc1e5cf414bc903d000ff506703f10119", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.32.1.openbsd-arm64", - "sha256": "7b9a27163853b8dfbaf935fa7526befa90f11a04eb4dad3e72f4c446bee4ddc3", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.32.1.linux-ppc64le", - "sha256": "7d6428c784d5665e846d533c8ae2309942cbc5ef2fa82c5d2c20a9cdd2aa9609", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.32.1.linux-riscv64", - "sha256": "ff29d3ad8756d11c2fdfddf068d794615d52a2b052b0e2e50edbdbeaf11cbe42", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.32.1.linux-s390x", - "sha256": "f3e5e960ce35f16c592354e9d6a704f206550d92292c850f193c1af5289b60e5", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.32.1.windows-amd64.exe", - "sha256": "47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.32.1.windows-arm64.exe", - "sha256": "a39bb64734f1cf749120ed3c35a7cb9bf886b4ec3b78d3c2e84abf0fb95a0044", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-arm64.exe" - } - }, - "version": "0.32.1" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "5633cb21e06a7c88c7ca48a9334d3d0f7f892e9605ae9e9a45f9a095d4ffceb8", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "14159a5fde026633a7d436d6f61979351296a6c24921c009900ff6fb289dd097", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "364a8f6d32daa9c4343c5335451af9b7f9531d9079f9621d6800c6c60eb438a1", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "da671ae15b4d7c68c38b572a2e9ceba89f09657d2682c2d2e34ad6db828e7442", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "726cc96f92a8c0e4ca4484405271a1e16c09eb6dd6754ad5a33bcaf96486e0a9", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "100d5ed84adc51786b17b450e896f1c410624e1b9f1595cf51df9080009d3788", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "074fe8a082415c84d37a11c325808c2f4aa35e1ed3b15e3fd676feb85480ee59", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "f09c0fe479a22563ab70a87ff09611a0da66a02b29bc97926bbc926e6ea27cea", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "6a5c638f7c3b2cacd87eda50af1b98474950d38ea094308a370c7fa3db10c47c", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "3f3dd613a410f7060f3cb806f8a35602b27b8c6b62548e87cb20bd27b765b2ea", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-aarch64.exe" - } - }, - "version": "5.1.0" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "29.3.0-rc.1" - } + "29-rc": null } From 22bb6ab52bd5e66c43b6c4070afd06a1b093ea2d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 20 Mar 2026 03:04:12 -0700 Subject: [PATCH 583/667] Update 29 to compose 5.1.1 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index fdd82d27d..187371391 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.1.0 +ENV DOCKER_COMPOSE_VERSION 5.1.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-x86_64'; \ - sha256='5633cb21e06a7c88c7ca48a9334d3d0f7f892e9605ae9e9a45f9a095d4ffceb8'; \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-x86_64'; \ + sha256='2ac954c9d506b912a12477d72f01601dc72ec918c429c7bae48fd707bdf0f3e5'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv6'; \ - sha256='14159a5fde026633a7d436d6f61979351296a6c24921c009900ff6fb289dd097'; \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv6'; \ + sha256='dbc7d5be282b2f465fb76841588e446f5fee10104c73428e8130bfa9baf1f1e2'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv7'; \ - sha256='364a8f6d32daa9c4343c5335451af9b7f9531d9079f9621d6800c6c60eb438a1'; \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv7'; \ + sha256='5cf43b83c705b24df9dbee1d35a6f085189ee2c1169444147192daf932683ed4'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-aarch64'; \ - sha256='da671ae15b4d7c68c38b572a2e9ceba89f09657d2682c2d2e34ad6db828e7442'; \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-aarch64'; \ + sha256='4b5c42952b7dd81f508d01a771df2a9e5dbffe9b8c5c7d983e738504ad38f056'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-ppc64le'; \ - sha256='074fe8a082415c84d37a11c325808c2f4aa35e1ed3b15e3fd676feb85480ee59'; \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-ppc64le'; \ + sha256='e131760ddd58dd5fc42b80ce9e4c49ecb6e8c26638a1c4bc3aa526f58c2440bf'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-riscv64'; \ - sha256='f09c0fe479a22563ab70a87ff09611a0da66a02b29bc97926bbc926e6ea27cea'; \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-riscv64'; \ + sha256='8f0df39eaf9014bce4c2505c91d067eb22631e894caabba7c5dae56c72c316f2'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-s390x'; \ - sha256='6a5c638f7c3b2cacd87eda50af1b98474950d38ea094308a370c7fa3db10c47c'; \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-s390x'; \ + sha256='87c0b606dcaf49b61f651f2b4e946e03a14e06e1dc16557a408a85e9796884f2'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 80631c946..62baab01c 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a +ENV DOCKER_COMPOSE_VERSION 5.1.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index ef8084a14..d006ea4b7 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a +ENV DOCKER_COMPOSE_VERSION 5.1.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index facf7854d..188d60af6 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "5633cb21e06a7c88c7ca48a9334d3d0f7f892e9605ae9e9a45f9a095d4ffceb8", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-x86_64" + "sha256": "2ac954c9d506b912a12477d72f01601dc72ec918c429c7bae48fd707bdf0f3e5", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "14159a5fde026633a7d436d6f61979351296a6c24921c009900ff6fb289dd097", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv6" + "sha256": "dbc7d5be282b2f465fb76841588e446f5fee10104c73428e8130bfa9baf1f1e2", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "364a8f6d32daa9c4343c5335451af9b7f9531d9079f9621d6800c6c60eb438a1", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-armv7" + "sha256": "5cf43b83c705b24df9dbee1d35a6f085189ee2c1169444147192daf932683ed4", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "da671ae15b4d7c68c38b572a2e9ceba89f09657d2682c2d2e34ad6db828e7442", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-aarch64" + "sha256": "4b5c42952b7dd81f508d01a771df2a9e5dbffe9b8c5c7d983e738504ad38f056", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "726cc96f92a8c0e4ca4484405271a1e16c09eb6dd6754ad5a33bcaf96486e0a9", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-darwin-x86_64" + "sha256": "2d1845ad583a08095b469547dc1bee2a985d1db3b62bc478f88361b85c8ff0e9", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "100d5ed84adc51786b17b450e896f1c410624e1b9f1595cf51df9080009d3788", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-darwin-aarch64" + "sha256": "7b10566e09366d1c22222eb0726805b8c488b4109e63689fd6c543d0006504e2", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "074fe8a082415c84d37a11c325808c2f4aa35e1ed3b15e3fd676feb85480ee59", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-ppc64le" + "sha256": "e131760ddd58dd5fc42b80ce9e4c49ecb6e8c26638a1c4bc3aa526f58c2440bf", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "f09c0fe479a22563ab70a87ff09611a0da66a02b29bc97926bbc926e6ea27cea", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-riscv64" + "sha256": "8f0df39eaf9014bce4c2505c91d067eb22631e894caabba7c5dae56c72c316f2", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "6a5c638f7c3b2cacd87eda50af1b98474950d38ea094308a370c7fa3db10c47c", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-linux-s390x" + "sha256": "87c0b606dcaf49b61f651f2b4e946e03a14e06e1dc16557a408a85e9796884f2", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "ee84e42b93c501cb0aa2caa84d76b5f30ca6fb92f070e289fc37be7332c5822a", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-x86_64.exe" + "sha256": "f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "3f3dd613a410f7060f3cb806f8a35602b27b8c6b62548e87cb20bd27b765b2ea", - "url": "https://github.com/docker/compose/releases/download/v5.1.0/docker-compose-windows-aarch64.exe" + "sha256": "2c42d7600886bb56d9bb009f348b4f7f8c603c954c7b07be3d53b3218877ce4a", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-aarch64.exe" } }, - "version": "5.1.0" + "version": "5.1.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 1596d25a6ab0b083d441fb7ca26bc0fe6b889baa Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 25 Mar 2026 11:01:13 -0700 Subject: [PATCH 584/667] Update 29 to 29.3.1 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 187371391..66fddc572 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.3.0 +ENV DOCKER_VERSION 29.3.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.3.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.3.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.3.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.3.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index fcc7a6d5a..f964352ae 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.3.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.3.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 99bdd4b97..4a3fe742f 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.3.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.3.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.3.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.3.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.3.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 62baab01c..6493bc242 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.3.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.3.0.zip +ENV DOCKER_VERSION 29.3.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.3.1.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index d006ea4b7..ea3ff5672 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.3.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.3.0.zip +ENV DOCKER_VERSION 29.3.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.3.1.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/versions.json b/versions.json index 188d60af6..1644e8311 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.3.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.3.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.3.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.3.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.3.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.3.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.3.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.3.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.3.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.3.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.3.1.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.3.0" + "version": "29.3.1" }, "29-rc": null } From 814aff68fcfb7250c92ec3ae74768c804572c1a3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 31 Mar 2026 09:04:14 -0700 Subject: [PATCH 585/667] Update 29 to buildx 0.33.0 --- 29/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 66fddc572..4dd3e8cf7 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.32.1 +ENV DOCKER_BUILDX_VERSION 0.33.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-amd64'; \ - sha256='2bbc1b8ebc9a05287b01bc2fe6633ec5e2f53d58ee955ae69756d668e7098e5e'; \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-amd64'; \ + sha256='9426a15411f35f635afef3f5d3bae53155c3e30d26dee430cc968e13d34be49f'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v6'; \ - sha256='545d2b678e9a494e0891526ee4977699132c16659c8b3c25a4be8484cf19f691'; \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v6'; \ + sha256='b33311b149623316b840ce25f0b6686433c6aecaca560d8b35906423f8f597bb'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v7'; \ - sha256='c3abd2992c0cbef5d307ec59d490f65c563008798a6b01a85a82069ad9945aad'; \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v7'; \ + sha256='4d80358ce3d217f38ac9e914cb8501fd4a8a45bc3ac3c23d303e623f275a45df'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm64'; \ - sha256='f03767cb0149759d409cd600b915bce764175ffda6eb3e86e14cc84a5637176a'; \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm64'; \ + sha256='204dc28447d3bb48f42ed1ce5747e0885cd57e306506a39029311becdb1ef786'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-ppc64le'; \ - sha256='7d6428c784d5665e846d533c8ae2309942cbc5ef2fa82c5d2c20a9cdd2aa9609'; \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-ppc64le'; \ + sha256='46b0444858c8db8c6f741dca20b815f50046a2d73f4874a54dae2719df145ad3'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-riscv64'; \ - sha256='ff29d3ad8756d11c2fdfddf068d794615d52a2b052b0e2e50edbdbeaf11cbe42'; \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-riscv64'; \ + sha256='5003b19409f2dfb38fc5f00a8eac4b1d810f6087b88ae007c6983287b93095dd'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-s390x'; \ - sha256='f3e5e960ce35f16c592354e9d6a704f206550d92292c850f193c1af5289b60e5'; \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-s390x'; \ + sha256='17fbec8163440e73d1e784d55faf483b17782aac471d867a525fa370f3ed317c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 6493bc242..1eafd6c68 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.32.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9 +ENV DOCKER_BUILDX_VERSION 0.33.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index ea3ff5672..7e369f735 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.32.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9 +ENV DOCKER_BUILDX_VERSION 0.33.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 1644e8311..5da5aaa7a 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.32.1.linux-amd64", - "sha256": "2bbc1b8ebc9a05287b01bc2fe6633ec5e2f53d58ee955ae69756d668e7098e5e", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-amd64" + "file": "buildx-v0.33.0.linux-amd64", + "sha256": "9426a15411f35f635afef3f5d3bae53155c3e30d26dee430cc968e13d34be49f", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.32.1.linux-arm-v6", - "sha256": "545d2b678e9a494e0891526ee4977699132c16659c8b3c25a4be8484cf19f691", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v6" + "file": "buildx-v0.33.0.linux-arm-v6", + "sha256": "b33311b149623316b840ce25f0b6686433c6aecaca560d8b35906423f8f597bb", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.32.1.linux-arm-v7", - "sha256": "c3abd2992c0cbef5d307ec59d490f65c563008798a6b01a85a82069ad9945aad", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm-v7" + "file": "buildx-v0.33.0.linux-arm-v7", + "sha256": "4d80358ce3d217f38ac9e914cb8501fd4a8a45bc3ac3c23d303e623f275a45df", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.32.1.linux-arm64", - "sha256": "f03767cb0149759d409cd600b915bce764175ffda6eb3e86e14cc84a5637176a", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-arm64" + "file": "buildx-v0.33.0.linux-arm64", + "sha256": "204dc28447d3bb48f42ed1ce5747e0885cd57e306506a39029311becdb1ef786", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.32.1.freebsd-amd64", - "sha256": "514154a7f1881a7b6b8a317ac5d3e0c38f2df744d5e6893617d3ee9b32a621ba", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.freebsd-amd64" + "file": "buildx-v0.33.0.freebsd-amd64", + "sha256": "125f683233d38c628e4db0d729e6c4e7a9caa518f63075941b134226ac55b019", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.32.1.freebsd-arm64", - "sha256": "bd7f854de556e44162cc7ed87f0aebda6a31c623fc9cb2fd3c37a8eee21c1b55", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.freebsd-arm64" + "file": "buildx-v0.33.0.freebsd-arm64", + "sha256": "a4f7b9f59dd93b36fe7d4eca0d6becb916859e937fb4fe7755eb5882a8430fd1", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.32.1.netbsd-amd64", - "sha256": "391c32fac3255687532b245aeda6a2ad34d284ae97d23b34b3c505e639111254", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.netbsd-amd64" + "file": "buildx-v0.33.0.netbsd-amd64", + "sha256": "6e93fd3500f15f64d06230d196d0085222e337c27a55e1d359ca1642a1b8a680", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.32.1.netbsd-arm64", - "sha256": "1dbec61b5441125161855561ad06fca1b523c0292b5badde432644b894162e95", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.netbsd-arm64" + "file": "buildx-v0.33.0.netbsd-arm64", + "sha256": "e5dcc84d68d77998b3b9f40ac845fde2f853580c9e77f7402c3d5df47e0742e0", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.32.1.openbsd-amd64", - "sha256": "3d0d66e62430ee606a43eb6222c0598fc1e5cf414bc903d000ff506703f10119", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.openbsd-amd64" + "file": "buildx-v0.33.0.openbsd-amd64", + "sha256": "f9422b0ffc9c1ec349ebc7f48de678e335dcd25076dc82f53a54cc90d45f57aa", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.32.1.openbsd-arm64", - "sha256": "7b9a27163853b8dfbaf935fa7526befa90f11a04eb4dad3e72f4c446bee4ddc3", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.openbsd-arm64" + "file": "buildx-v0.33.0.openbsd-arm64", + "sha256": "4d27f59815667fb82ed8cff4212d03028057bef69b062436a750d09fdfbe9599", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.32.1.linux-ppc64le", - "sha256": "7d6428c784d5665e846d533c8ae2309942cbc5ef2fa82c5d2c20a9cdd2aa9609", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-ppc64le" + "file": "buildx-v0.33.0.linux-ppc64le", + "sha256": "46b0444858c8db8c6f741dca20b815f50046a2d73f4874a54dae2719df145ad3", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.32.1.linux-riscv64", - "sha256": "ff29d3ad8756d11c2fdfddf068d794615d52a2b052b0e2e50edbdbeaf11cbe42", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-riscv64" + "file": "buildx-v0.33.0.linux-riscv64", + "sha256": "5003b19409f2dfb38fc5f00a8eac4b1d810f6087b88ae007c6983287b93095dd", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.32.1.linux-s390x", - "sha256": "f3e5e960ce35f16c592354e9d6a704f206550d92292c850f193c1af5289b60e5", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.linux-s390x" + "file": "buildx-v0.33.0.linux-s390x", + "sha256": "17fbec8163440e73d1e784d55faf483b17782aac471d867a525fa370f3ed317c", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.32.1.windows-amd64.exe", - "sha256": "47d76e47acf3c7611dd594c4b0909fec680ae6406b6fa775f6077b195837e2b9", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-amd64.exe" + "file": "buildx-v0.33.0.windows-amd64.exe", + "sha256": "832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.32.1.windows-arm64.exe", - "sha256": "a39bb64734f1cf749120ed3c35a7cb9bf886b4ec3b78d3c2e84abf0fb95a0044", - "url": "https://github.com/docker/buildx/releases/download/v0.32.1/buildx-v0.32.1.windows-arm64.exe" + "file": "buildx-v0.33.0.windows-arm64.exe", + "sha256": "3f7a8129e21faf8c860efd14bbf0feb714c0aac9ca9c08dc4b39b39455d0bcf1", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-arm64.exe" } }, - "version": "0.32.1" + "version": "0.33.0" }, "compose": { "arches": { From 344aa720cf956957f0e14731ec89066cb6ea7074 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 3 Apr 2026 09:04:18 -0700 Subject: [PATCH 586/667] Update 29-rc to 29.4.0-rc.1, buildx 0.33.0, compose 5.1.1 --- 29-rc/cli/Dockerfile | 167 ++++++++++++ 29-rc/cli/docker-entrypoint.sh | 61 +++++ 29-rc/cli/modprobe.sh | 20 ++ 29-rc/dind-rootless/Dockerfile | 55 ++++ 29-rc/dind/Dockerfile | 108 ++++++++ 29-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 171 ++++++++++++- 9 files changed, 1001 insertions(+), 1 deletion(-) create mode 100644 29-rc/cli/Dockerfile create mode 100755 29-rc/cli/docker-entrypoint.sh create mode 100755 29-rc/cli/modprobe.sh create mode 100644 29-rc/dind-rootless/Dockerfile create mode 100644 29-rc/dind/Dockerfile create mode 100755 29-rc/dind/dockerd-entrypoint.sh create mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile new file mode 100644 index 000000000..ce6165c89 --- /dev/null +++ b/29-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.23 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 29.4.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.4.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.4.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.4.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.4.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.33.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-amd64'; \ + sha256='9426a15411f35f635afef3f5d3bae53155c3e30d26dee430cc968e13d34be49f'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v6'; \ + sha256='b33311b149623316b840ce25f0b6686433c6aecaca560d8b35906423f8f597bb'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v7'; \ + sha256='4d80358ce3d217f38ac9e914cb8501fd4a8a45bc3ac3c23d303e623f275a45df'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm64'; \ + sha256='204dc28447d3bb48f42ed1ce5747e0885cd57e306506a39029311becdb1ef786'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-ppc64le'; \ + sha256='46b0444858c8db8c6f741dca20b815f50046a2d73f4874a54dae2719df145ad3'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-riscv64'; \ + sha256='5003b19409f2dfb38fc5f00a8eac4b1d810f6087b88ae007c6983287b93095dd'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-s390x'; \ + sha256='17fbec8163440e73d1e784d55faf483b17782aac471d867a525fa370f3ed317c'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 5.1.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-x86_64'; \ + sha256='2ac954c9d506b912a12477d72f01601dc72ec918c429c7bae48fd707bdf0f3e5'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv6'; \ + sha256='dbc7d5be282b2f465fb76841588e446f5fee10104c73428e8130bfa9baf1f1e2'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv7'; \ + sha256='5cf43b83c705b24df9dbee1d35a6f085189ee2c1169444147192daf932683ed4'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-aarch64'; \ + sha256='4b5c42952b7dd81f508d01a771df2a9e5dbffe9b8c5c7d983e738504ad38f056'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-ppc64le'; \ + sha256='e131760ddd58dd5fc42b80ce9e4c49ecb6e8c26638a1c4bc3aa526f58c2440bf'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-riscv64'; \ + sha256='8f0df39eaf9014bce4c2505c91d067eb22631e894caabba7c5dae56c72c316f2'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-s390x'; \ + sha256='87c0b606dcaf49b61f651f2b4e946e03a14e06e1dc16557a408a85e9796884f2'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/29-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/29-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..b2f5f7d77 --- /dev/null +++ b/29-rc/dind-rootless/Dockerfile @@ -0,0 +1,55 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-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 +# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.4.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.4.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + 'docker-rootless-extras/vpnkit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version; \ + vpnkit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile new file mode 100644 index 000000000..8e6463706 --- /dev/null +++ b/29-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.23&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.4.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.4.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.4.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.4.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..8a291dfa5 --- /dev/null +++ b/29-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..b9bfecb23 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.4.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.4.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.33.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.1.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..dc1515c91 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.4.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.4.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.33.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.1.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 5da5aaa7a..2e442af6b 100644 --- a/versions.json +++ b/versions.json @@ -169,5 +169,174 @@ ], "version": "29.3.1" }, - "29-rc": null + "29-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.4.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.4.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.4.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.4.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.4.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.4.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.4.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.33.0.linux-amd64", + "sha256": "9426a15411f35f635afef3f5d3bae53155c3e30d26dee430cc968e13d34be49f", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.33.0.linux-arm-v6", + "sha256": "b33311b149623316b840ce25f0b6686433c6aecaca560d8b35906423f8f597bb", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.33.0.linux-arm-v7", + "sha256": "4d80358ce3d217f38ac9e914cb8501fd4a8a45bc3ac3c23d303e623f275a45df", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.33.0.linux-arm64", + "sha256": "204dc28447d3bb48f42ed1ce5747e0885cd57e306506a39029311becdb1ef786", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.33.0.freebsd-amd64", + "sha256": "125f683233d38c628e4db0d729e6c4e7a9caa518f63075941b134226ac55b019", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.33.0.freebsd-arm64", + "sha256": "a4f7b9f59dd93b36fe7d4eca0d6becb916859e937fb4fe7755eb5882a8430fd1", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.33.0.netbsd-amd64", + "sha256": "6e93fd3500f15f64d06230d196d0085222e337c27a55e1d359ca1642a1b8a680", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.33.0.netbsd-arm64", + "sha256": "e5dcc84d68d77998b3b9f40ac845fde2f853580c9e77f7402c3d5df47e0742e0", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.33.0.openbsd-amd64", + "sha256": "f9422b0ffc9c1ec349ebc7f48de678e335dcd25076dc82f53a54cc90d45f57aa", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.33.0.openbsd-arm64", + "sha256": "4d27f59815667fb82ed8cff4212d03028057bef69b062436a750d09fdfbe9599", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.33.0.linux-ppc64le", + "sha256": "46b0444858c8db8c6f741dca20b815f50046a2d73f4874a54dae2719df145ad3", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.33.0.linux-riscv64", + "sha256": "5003b19409f2dfb38fc5f00a8eac4b1d810f6087b88ae007c6983287b93095dd", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.33.0.linux-s390x", + "sha256": "17fbec8163440e73d1e784d55faf483b17782aac471d867a525fa370f3ed317c", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.33.0.windows-amd64.exe", + "sha256": "832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.33.0.windows-arm64.exe", + "sha256": "3f7a8129e21faf8c860efd14bbf0feb714c0aac9ca9c08dc4b39b39455d0bcf1", + "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-arm64.exe" + } + }, + "version": "0.33.0" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "2ac954c9d506b912a12477d72f01601dc72ec918c429c7bae48fd707bdf0f3e5", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "dbc7d5be282b2f465fb76841588e446f5fee10104c73428e8130bfa9baf1f1e2", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "5cf43b83c705b24df9dbee1d35a6f085189ee2c1169444147192daf932683ed4", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "4b5c42952b7dd81f508d01a771df2a9e5dbffe9b8c5c7d983e738504ad38f056", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "2d1845ad583a08095b469547dc1bee2a985d1db3b62bc478f88361b85c8ff0e9", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "7b10566e09366d1c22222eb0726805b8c488b4109e63689fd6c543d0006504e2", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "e131760ddd58dd5fc42b80ce9e4c49ecb6e8c26638a1c4bc3aa526f58c2440bf", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "8f0df39eaf9014bce4c2505c91d067eb22631e894caabba7c5dae56c72c316f2", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "87c0b606dcaf49b61f651f2b4e946e03a14e06e1dc16557a408a85e9796884f2", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "2c42d7600886bb56d9bb009f348b4f7f8c603c954c7b07be3d53b3218877ce4a", + "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-aarch64.exe" + } + }, + "version": "5.1.1" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "29.4.0-rc.1" + } } From 5b2346972dda13a30a936507fd11696296a527ea Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 7 Apr 2026 03:04:19 -0700 Subject: [PATCH 587/667] Update 29 to 29.4.0 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 4dd3e8cf7..e479e8bd8 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.3.1 +ENV DOCKER_VERSION 29.4.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.4.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index f964352ae..422ddb394 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.4.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 4a3fe742f..0d4573199 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.4.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.3.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 1eafd6c68..a1fac37c3 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.3.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.3.1.zip +ENV DOCKER_VERSION 29.4.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.0.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 7e369f735..5b872f97c 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.3.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.3.1.zip +ENV DOCKER_VERSION 29.4.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.0.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/versions.json b/versions.json index 2e442af6b..2de895fe6 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.3.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.4.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.4.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.4.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.4.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.3.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.3.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.4.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.3.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.4.0.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.3.1" + "version": "29.4.0" }, "29-rc": { "arches": { From 2d000b413986c4a9d0f68c7b7b14dcbd71ba38dd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 7 Apr 2026 03:06:13 -0700 Subject: [PATCH 588/667] Update 29-rc --- 29-rc/cli/Dockerfile | 167 ------------ 29-rc/cli/docker-entrypoint.sh | 61 ----- 29-rc/cli/modprobe.sh | 20 -- 29-rc/dind-rootless/Dockerfile | 55 ---- 29-rc/dind/Dockerfile | 108 -------- 29-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 171 +------------ 9 files changed, 1 insertion(+), 1001 deletions(-) delete mode 100644 29-rc/cli/Dockerfile delete mode 100755 29-rc/cli/docker-entrypoint.sh delete mode 100755 29-rc/cli/modprobe.sh delete mode 100644 29-rc/dind-rootless/Dockerfile delete mode 100644 29-rc/dind/Dockerfile delete mode 100755 29-rc/dind/dockerd-entrypoint.sh delete mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile deleted file mode 100644 index ce6165c89..000000000 --- a/29-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.23 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 29.4.0-rc.1 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.4.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.4.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.4.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.4.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.33.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-amd64'; \ - sha256='9426a15411f35f635afef3f5d3bae53155c3e30d26dee430cc968e13d34be49f'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v6'; \ - sha256='b33311b149623316b840ce25f0b6686433c6aecaca560d8b35906423f8f597bb'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v7'; \ - sha256='4d80358ce3d217f38ac9e914cb8501fd4a8a45bc3ac3c23d303e623f275a45df'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm64'; \ - sha256='204dc28447d3bb48f42ed1ce5747e0885cd57e306506a39029311becdb1ef786'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-ppc64le'; \ - sha256='46b0444858c8db8c6f741dca20b815f50046a2d73f4874a54dae2719df145ad3'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-riscv64'; \ - sha256='5003b19409f2dfb38fc5f00a8eac4b1d810f6087b88ae007c6983287b93095dd'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-s390x'; \ - sha256='17fbec8163440e73d1e784d55faf483b17782aac471d867a525fa370f3ed317c'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 5.1.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-x86_64'; \ - sha256='2ac954c9d506b912a12477d72f01601dc72ec918c429c7bae48fd707bdf0f3e5'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv6'; \ - sha256='dbc7d5be282b2f465fb76841588e446f5fee10104c73428e8130bfa9baf1f1e2'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv7'; \ - sha256='5cf43b83c705b24df9dbee1d35a6f085189ee2c1169444147192daf932683ed4'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-aarch64'; \ - sha256='4b5c42952b7dd81f508d01a771df2a9e5dbffe9b8c5c7d983e738504ad38f056'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-ppc64le'; \ - sha256='e131760ddd58dd5fc42b80ce9e4c49ecb6e8c26638a1c4bc3aa526f58c2440bf'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-riscv64'; \ - sha256='8f0df39eaf9014bce4c2505c91d067eb22631e894caabba7c5dae56c72c316f2'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-s390x'; \ - sha256='87c0b606dcaf49b61f651f2b4e946e03a14e06e1dc16557a408a85e9796884f2'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/29-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/29-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile deleted file mode 100644 index b2f5f7d77..000000000 --- a/29-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-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 -# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.4.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.4.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version; \ - vpnkit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile deleted file mode 100644 index 8e6463706..000000000 --- a/29-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.23&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.4.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.4.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.4.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.4.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 8a291dfa5..000000000 --- a/29-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index b9bfecb23..000000000 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.4.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.4.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.33.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index dc1515c91..000000000 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.4.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.4.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.33.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 2de895fe6..9fda52636 100644 --- a/versions.json +++ b/versions.json @@ -169,174 +169,5 @@ ], "version": "29.4.0" }, - "29-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.4.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.4.0-rc.1.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.4.0-rc.1.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.4.0-rc.1.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.4.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.4.0-rc.1.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.4.0-rc.1.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.33.0.linux-amd64", - "sha256": "9426a15411f35f635afef3f5d3bae53155c3e30d26dee430cc968e13d34be49f", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.33.0.linux-arm-v6", - "sha256": "b33311b149623316b840ce25f0b6686433c6aecaca560d8b35906423f8f597bb", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.33.0.linux-arm-v7", - "sha256": "4d80358ce3d217f38ac9e914cb8501fd4a8a45bc3ac3c23d303e623f275a45df", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.33.0.linux-arm64", - "sha256": "204dc28447d3bb48f42ed1ce5747e0885cd57e306506a39029311becdb1ef786", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.33.0.freebsd-amd64", - "sha256": "125f683233d38c628e4db0d729e6c4e7a9caa518f63075941b134226ac55b019", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.33.0.freebsd-arm64", - "sha256": "a4f7b9f59dd93b36fe7d4eca0d6becb916859e937fb4fe7755eb5882a8430fd1", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.33.0.netbsd-amd64", - "sha256": "6e93fd3500f15f64d06230d196d0085222e337c27a55e1d359ca1642a1b8a680", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.33.0.netbsd-arm64", - "sha256": "e5dcc84d68d77998b3b9f40ac845fde2f853580c9e77f7402c3d5df47e0742e0", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.33.0.openbsd-amd64", - "sha256": "f9422b0ffc9c1ec349ebc7f48de678e335dcd25076dc82f53a54cc90d45f57aa", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.33.0.openbsd-arm64", - "sha256": "4d27f59815667fb82ed8cff4212d03028057bef69b062436a750d09fdfbe9599", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.33.0.linux-ppc64le", - "sha256": "46b0444858c8db8c6f741dca20b815f50046a2d73f4874a54dae2719df145ad3", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.33.0.linux-riscv64", - "sha256": "5003b19409f2dfb38fc5f00a8eac4b1d810f6087b88ae007c6983287b93095dd", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.33.0.linux-s390x", - "sha256": "17fbec8163440e73d1e784d55faf483b17782aac471d867a525fa370f3ed317c", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.33.0.windows-amd64.exe", - "sha256": "832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.33.0.windows-arm64.exe", - "sha256": "3f7a8129e21faf8c860efd14bbf0feb714c0aac9ca9c08dc4b39b39455d0bcf1", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-arm64.exe" - } - }, - "version": "0.33.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "2ac954c9d506b912a12477d72f01601dc72ec918c429c7bae48fd707bdf0f3e5", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "dbc7d5be282b2f465fb76841588e446f5fee10104c73428e8130bfa9baf1f1e2", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "5cf43b83c705b24df9dbee1d35a6f085189ee2c1169444147192daf932683ed4", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "4b5c42952b7dd81f508d01a771df2a9e5dbffe9b8c5c7d983e738504ad38f056", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "2d1845ad583a08095b469547dc1bee2a985d1db3b62bc478f88361b85c8ff0e9", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "7b10566e09366d1c22222eb0726805b8c488b4109e63689fd6c543d0006504e2", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "e131760ddd58dd5fc42b80ce9e4c49ecb6e8c26638a1c4bc3aa526f58c2440bf", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "8f0df39eaf9014bce4c2505c91d067eb22631e894caabba7c5dae56c72c316f2", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "87c0b606dcaf49b61f651f2b4e946e03a14e06e1dc16557a408a85e9796884f2", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "2c42d7600886bb56d9bb009f348b4f7f8c603c954c7b07be3d53b3218877ce4a", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-aarch64.exe" - } - }, - "version": "5.1.1" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "29.4.0-rc.1" - } + "29-rc": null } From b46b6ad0a63a4919abdc41740982dcac5b6ec7e1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 9 Apr 2026 03:04:13 -0700 Subject: [PATCH 589/667] Update 29 to compose 5.1.2 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index e479e8bd8..49653076f 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.1.1 +ENV DOCKER_COMPOSE_VERSION 5.1.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-x86_64'; \ - sha256='2ac954c9d506b912a12477d72f01601dc72ec918c429c7bae48fd707bdf0f3e5'; \ + url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-x86_64'; \ + sha256='c372e512a36e67716b0b3a1264ccdc461dec7a7beff601b81f7c5fb008e3511e'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv6'; \ - sha256='dbc7d5be282b2f465fb76841588e446f5fee10104c73428e8130bfa9baf1f1e2'; \ + url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-armv6'; \ + sha256='9e188f62d0641bb261ec08ea8e875625c3ccc2592f6c0e1be4e4bbf7a9df574a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv7'; \ - sha256='5cf43b83c705b24df9dbee1d35a6f085189ee2c1169444147192daf932683ed4'; \ + url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-armv7'; \ + sha256='3692fc854ccef23862ce819d64fe2e263e47a4685b2084339b64410cf868c002'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-aarch64'; \ - sha256='4b5c42952b7dd81f508d01a771df2a9e5dbffe9b8c5c7d983e738504ad38f056'; \ + url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-aarch64'; \ + sha256='d5ce4020039cdbe81679b770e64f89d2cc601398d3b1aacd84a02a9176cd9d20'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-ppc64le'; \ - sha256='e131760ddd58dd5fc42b80ce9e4c49ecb6e8c26638a1c4bc3aa526f58c2440bf'; \ + url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-ppc64le'; \ + sha256='ac80a6a963d2d9679f05784808042b11eb460fed77e875ea340633b625fe488a'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-riscv64'; \ - sha256='8f0df39eaf9014bce4c2505c91d067eb22631e894caabba7c5dae56c72c316f2'; \ + url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-riscv64'; \ + sha256='e3b1d40445be0be656c5f80367a2c78465703d01eedf8fa160032bba652b85f9'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-s390x'; \ - sha256='87c0b606dcaf49b61f651f2b4e946e03a14e06e1dc16557a408a85e9796884f2'; \ + url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-s390x'; \ + sha256='3760e0d3ff3c4e18f6a21654d0d0151d9c6f4fc4987905ee92eacde5cb247b13'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index a1fac37c3..dde493eba 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b +ENV DOCKER_COMPOSE_VERSION 5.1.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 00e839301ca18ee5109b3ef086788f3a281c317c0b77ba42a06fc6f806401255 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 5b872f97c..85c58a8d7 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b +ENV DOCKER_COMPOSE_VERSION 5.1.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 00e839301ca18ee5109b3ef086788f3a281c317c0b77ba42a06fc6f806401255 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 9fda52636..b177be999 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "2ac954c9d506b912a12477d72f01601dc72ec918c429c7bae48fd707bdf0f3e5", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-x86_64" + "sha256": "c372e512a36e67716b0b3a1264ccdc461dec7a7beff601b81f7c5fb008e3511e", + "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "dbc7d5be282b2f465fb76841588e446f5fee10104c73428e8130bfa9baf1f1e2", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv6" + "sha256": "9e188f62d0641bb261ec08ea8e875625c3ccc2592f6c0e1be4e4bbf7a9df574a", + "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "5cf43b83c705b24df9dbee1d35a6f085189ee2c1169444147192daf932683ed4", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-armv7" + "sha256": "3692fc854ccef23862ce819d64fe2e263e47a4685b2084339b64410cf868c002", + "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "4b5c42952b7dd81f508d01a771df2a9e5dbffe9b8c5c7d983e738504ad38f056", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-aarch64" + "sha256": "d5ce4020039cdbe81679b770e64f89d2cc601398d3b1aacd84a02a9176cd9d20", + "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "2d1845ad583a08095b469547dc1bee2a985d1db3b62bc478f88361b85c8ff0e9", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-darwin-x86_64" + "sha256": "ed6ea4d6a41cbf1f5d10fdd18b5e8be9e2b692441084e6655a7073c308ef2dc4", + "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "7b10566e09366d1c22222eb0726805b8c488b4109e63689fd6c543d0006504e2", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-darwin-aarch64" + "sha256": "95007edf638ad188dbb84a8ad2bae8861702a0a4324646c31d0c5152563bfc9b", + "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "e131760ddd58dd5fc42b80ce9e4c49ecb6e8c26638a1c4bc3aa526f58c2440bf", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-ppc64le" + "sha256": "ac80a6a963d2d9679f05784808042b11eb460fed77e875ea340633b625fe488a", + "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "8f0df39eaf9014bce4c2505c91d067eb22631e894caabba7c5dae56c72c316f2", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-riscv64" + "sha256": "e3b1d40445be0be656c5f80367a2c78465703d01eedf8fa160032bba652b85f9", + "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "87c0b606dcaf49b61f651f2b4e946e03a14e06e1dc16557a408a85e9796884f2", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-linux-s390x" + "sha256": "3760e0d3ff3c4e18f6a21654d0d0151d9c6f4fc4987905ee92eacde5cb247b13", + "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "f7ad2f6965c88153e4902019ec86e95414f0025cba0b6440f328f935a1f8b12b", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-x86_64.exe" + "sha256": "00e839301ca18ee5109b3ef086788f3a281c317c0b77ba42a06fc6f806401255", + "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2c42d7600886bb56d9bb009f348b4f7f8c603c954c7b07be3d53b3218877ce4a", - "url": "https://github.com/docker/compose/releases/download/v5.1.1/docker-compose-windows-aarch64.exe" + "sha256": "553c96849d49d029774304e56723884a2f8696c2eb516f546d349ef1c9d303ba", + "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-windows-aarch64.exe" } }, - "version": "5.1.1" + "version": "5.1.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 62a251f97f9ebd98d73c41c09a38be3c4472a0b8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 15 Apr 2026 09:04:26 -0700 Subject: [PATCH 590/667] Update 29 to compose 5.1.3 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 49653076f..cb238e8a8 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.1.2 +ENV DOCKER_COMPOSE_VERSION 5.1.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-x86_64'; \ - sha256='c372e512a36e67716b0b3a1264ccdc461dec7a7beff601b81f7c5fb008e3511e'; \ + url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-x86_64'; \ + sha256='a0298760c9772d2c06888fc8703a487c94c3c3b0134adeef830742a2fc7647b4'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-armv6'; \ - sha256='9e188f62d0641bb261ec08ea8e875625c3ccc2592f6c0e1be4e4bbf7a9df574a'; \ + url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-armv6'; \ + sha256='514fc01481017bf4ae55a3b1fe7d598ca49a930e346803648bd88dba9d4ae3da'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-armv7'; \ - sha256='3692fc854ccef23862ce819d64fe2e263e47a4685b2084339b64410cf868c002'; \ + url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-armv7'; \ + sha256='4c1ce6ad43c184934a1f76cd55d7231192492c487acbd13e96258ed10fd9e468'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-aarch64'; \ - sha256='d5ce4020039cdbe81679b770e64f89d2cc601398d3b1aacd84a02a9176cd9d20'; \ + url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-aarch64'; \ + sha256='e8105a3e687ea7e0b0f81abe4bf9269c8a2801fb72c2b498b5ff2472bc54145f'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-ppc64le'; \ - sha256='ac80a6a963d2d9679f05784808042b11eb460fed77e875ea340633b625fe488a'; \ + url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-ppc64le'; \ + sha256='ceaa1a9f24ef471e6f9fc34b30d11dcb6d8021a9a283c5e7261521ef12951432'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-riscv64'; \ - sha256='e3b1d40445be0be656c5f80367a2c78465703d01eedf8fa160032bba652b85f9'; \ + url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-riscv64'; \ + sha256='f4a01e52ab7b14bc88e0657f6c477274f151c7907cfe6a5362709f7bd4814c44'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-s390x'; \ - sha256='3760e0d3ff3c4e18f6a21654d0d0151d9c6f4fc4987905ee92eacde5cb247b13'; \ + url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-s390x'; \ + sha256='552d11a594aa3d81b4b69a2abd2a5c2e699378038a8efaa8200c0b556be3451f'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index dde493eba..7e8128612 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 00e839301ca18ee5109b3ef086788f3a281c317c0b77ba42a06fc6f806401255 +ENV DOCKER_COMPOSE_VERSION 5.1.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5e6d72612b3165be9fea4ae889435fec76979a9779b6f62f4efee99dd5f41ea1 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 85c58a8d7..4761cccdc 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 00e839301ca18ee5109b3ef086788f3a281c317c0b77ba42a06fc6f806401255 +ENV DOCKER_COMPOSE_VERSION 5.1.3 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 5e6d72612b3165be9fea4ae889435fec76979a9779b6f62f4efee99dd5f41ea1 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b177be999..5288b24d6 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "c372e512a36e67716b0b3a1264ccdc461dec7a7beff601b81f7c5fb008e3511e", - "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-x86_64" + "sha256": "a0298760c9772d2c06888fc8703a487c94c3c3b0134adeef830742a2fc7647b4", + "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "9e188f62d0641bb261ec08ea8e875625c3ccc2592f6c0e1be4e4bbf7a9df574a", - "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-armv6" + "sha256": "514fc01481017bf4ae55a3b1fe7d598ca49a930e346803648bd88dba9d4ae3da", + "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "3692fc854ccef23862ce819d64fe2e263e47a4685b2084339b64410cf868c002", - "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-armv7" + "sha256": "4c1ce6ad43c184934a1f76cd55d7231192492c487acbd13e96258ed10fd9e468", + "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d5ce4020039cdbe81679b770e64f89d2cc601398d3b1aacd84a02a9176cd9d20", - "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-aarch64" + "sha256": "e8105a3e687ea7e0b0f81abe4bf9269c8a2801fb72c2b498b5ff2472bc54145f", + "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "ed6ea4d6a41cbf1f5d10fdd18b5e8be9e2b692441084e6655a7073c308ef2dc4", - "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-darwin-x86_64" + "sha256": "f11139d9822ce1f3843e16ed6c2e44ba5525423396c82fa22b08874b26abd102", + "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "95007edf638ad188dbb84a8ad2bae8861702a0a4324646c31d0c5152563bfc9b", - "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-darwin-aarch64" + "sha256": "b8461a8a53f7e0ce677139516b17661e7ccd54ac4f2dabae03ad79f2f2ae35c6", + "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "ac80a6a963d2d9679f05784808042b11eb460fed77e875ea340633b625fe488a", - "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-ppc64le" + "sha256": "ceaa1a9f24ef471e6f9fc34b30d11dcb6d8021a9a283c5e7261521ef12951432", + "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e3b1d40445be0be656c5f80367a2c78465703d01eedf8fa160032bba652b85f9", - "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-riscv64" + "sha256": "f4a01e52ab7b14bc88e0657f6c477274f151c7907cfe6a5362709f7bd4814c44", + "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "3760e0d3ff3c4e18f6a21654d0d0151d9c6f4fc4987905ee92eacde5cb247b13", - "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-linux-s390x" + "sha256": "552d11a594aa3d81b4b69a2abd2a5c2e699378038a8efaa8200c0b556be3451f", + "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "00e839301ca18ee5109b3ef086788f3a281c317c0b77ba42a06fc6f806401255", - "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-windows-x86_64.exe" + "sha256": "5e6d72612b3165be9fea4ae889435fec76979a9779b6f62f4efee99dd5f41ea1", + "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "553c96849d49d029774304e56723884a2f8696c2eb516f546d349ef1c9d303ba", - "url": "https://github.com/docker/compose/releases/download/v5.1.2/docker-compose-windows-aarch64.exe" + "sha256": "9bdabc5fb175161b93c41b2ce6464b816f8d2614e6b9641f5e0fdf20b188f4a2", + "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-windows-aarch64.exe" } }, - "version": "5.1.2" + "version": "5.1.3" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 5b5016b9257f0dfc3baf38b575f7505d16970b7e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 20 Apr 2026 11:59:39 -0700 Subject: [PATCH 591/667] Update 29 to 29.4.1 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index cb238e8a8..3893541e6 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.4.0 +ENV DOCKER_VERSION 29.4.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.4.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 422ddb394..ccd7fb61f 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.4.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 0d4573199..117249322 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.4.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 7e8128612..710ded139 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.4.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.0.zip +ENV DOCKER_VERSION 29.4.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.1.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 4761cccdc..128b80d21 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.4.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.0.zip +ENV DOCKER_VERSION 29.4.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.1.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/versions.json b/versions.json index 5288b24d6..4d6fa2b00 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.4.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.4.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.4.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.4.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.4.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.4.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.4.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.4.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.4.1.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.4.0" + "version": "29.4.1" }, "29-rc": null } From 85f809403de527c7b1e193435392ab0c58041613 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 6 May 2026 15:04:13 -0700 Subject: [PATCH 592/667] Update 29 to 29.4.3 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 3893541e6..4e739b92f 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.4.1 +ENV DOCKER_VERSION 29.4.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.4.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index ccd7fb61f..83bc3a632 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -25,10 +25,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-29.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.4.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 117249322..b427e78c6 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.4.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 710ded139..a1a85d6f1 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.4.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.1.zip +ENV DOCKER_VERSION 29.4.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.3.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 128b80d21..c72b5dd18 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.4.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.1.zip +ENV DOCKER_VERSION 29.4.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.3.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/versions.json b/versions.json index 4d6fa2b00..4c98450c5 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.4.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.4.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.4.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.4.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.4.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.4.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.4.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.4.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.4.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.4.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.4.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.4.3.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.4.1" + "version": "29.4.3" }, "29-rc": null } From 132c91a93dc0d406ed5924189df0f9c8f2dfcd64 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 13 May 2026 09:04:12 -0700 Subject: [PATCH 593/667] Update 29 to buildx 0.34.0 --- 29/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 4e739b92f..b9c8feb5b 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.33.0 +ENV DOCKER_BUILDX_VERSION 0.34.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-amd64'; \ - sha256='9426a15411f35f635afef3f5d3bae53155c3e30d26dee430cc968e13d34be49f'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-amd64'; \ + sha256='0144479d5a1cd710be3464ae898628cfa68033e16b225aef52f81930c45ac9b5'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v6'; \ - sha256='b33311b149623316b840ce25f0b6686433c6aecaca560d8b35906423f8f597bb'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm-v6'; \ + sha256='1f34337385921c5da43d63452282726b062aa887fda975f96dd3d6e869648bc6'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v7'; \ - sha256='4d80358ce3d217f38ac9e914cb8501fd4a8a45bc3ac3c23d303e623f275a45df'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm-v7'; \ + sha256='3560b5b6fd3485f4d0bd160e7edf56cc1f08f0cb5852c9af28bf3fab9973c7c2'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm64'; \ - sha256='204dc28447d3bb48f42ed1ce5747e0885cd57e306506a39029311becdb1ef786'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm64'; \ + sha256='565605fe0bb393ed5d11771e5b52fc7ef05c701868861fa85609747c9d74a440'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-ppc64le'; \ - sha256='46b0444858c8db8c6f741dca20b815f50046a2d73f4874a54dae2719df145ad3'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-ppc64le'; \ + sha256='c5ef8012f48a518e1c235ad408d26cd424d7b5fa87eaf78cb2ff4b9048730120'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-riscv64'; \ - sha256='5003b19409f2dfb38fc5f00a8eac4b1d810f6087b88ae007c6983287b93095dd'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-riscv64'; \ + sha256='80b27d5f3a346591a5045b81217ee5be578ed151ef8cbd883a892c0ec0ac33f1'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-s390x'; \ - sha256='17fbec8163440e73d1e784d55faf483b17782aac471d867a525fa370f3ed317c'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-s390x'; \ + sha256='04f5bd0d389f682c7e9287a3b3a1777b0848f8e10d58cbf9d4d12c9002bbb378'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index a1a85d6f1..9fdccf8f8 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.33.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed +ENV DOCKER_BUILDX_VERSION 0.34.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 96a10e259fa1380e7bbf9a3cb04872f201a6e7e331ddeeec8d3e38aa2650ddc5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index c72b5dd18..c530950ae 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.33.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed +ENV DOCKER_BUILDX_VERSION 0.34.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 96a10e259fa1380e7bbf9a3cb04872f201a6e7e331ddeeec8d3e38aa2650ddc5 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 4c98450c5..9a4b4a4c3 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.33.0.linux-amd64", - "sha256": "9426a15411f35f635afef3f5d3bae53155c3e30d26dee430cc968e13d34be49f", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-amd64" + "file": "buildx-v0.34.0.linux-amd64", + "sha256": "0144479d5a1cd710be3464ae898628cfa68033e16b225aef52f81930c45ac9b5", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.33.0.linux-arm-v6", - "sha256": "b33311b149623316b840ce25f0b6686433c6aecaca560d8b35906423f8f597bb", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v6" + "file": "buildx-v0.34.0.linux-arm-v6", + "sha256": "1f34337385921c5da43d63452282726b062aa887fda975f96dd3d6e869648bc6", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.33.0.linux-arm-v7", - "sha256": "4d80358ce3d217f38ac9e914cb8501fd4a8a45bc3ac3c23d303e623f275a45df", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm-v7" + "file": "buildx-v0.34.0.linux-arm-v7", + "sha256": "3560b5b6fd3485f4d0bd160e7edf56cc1f08f0cb5852c9af28bf3fab9973c7c2", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.33.0.linux-arm64", - "sha256": "204dc28447d3bb48f42ed1ce5747e0885cd57e306506a39029311becdb1ef786", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-arm64" + "file": "buildx-v0.34.0.linux-arm64", + "sha256": "565605fe0bb393ed5d11771e5b52fc7ef05c701868861fa85609747c9d74a440", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.33.0.freebsd-amd64", - "sha256": "125f683233d38c628e4db0d729e6c4e7a9caa518f63075941b134226ac55b019", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.freebsd-amd64" + "file": "buildx-v0.34.0.freebsd-amd64", + "sha256": "00f6921d188661d66c3b8ab631e6344adcfa96934d707af837c650cedcbb4d9d", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.33.0.freebsd-arm64", - "sha256": "a4f7b9f59dd93b36fe7d4eca0d6becb916859e937fb4fe7755eb5882a8430fd1", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.freebsd-arm64" + "file": "buildx-v0.34.0.freebsd-arm64", + "sha256": "8ae9d564c832ecfdeb0b92d2e2da8f1b705cdf53802894ec5fb70c7bbf4ce0a0", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.33.0.netbsd-amd64", - "sha256": "6e93fd3500f15f64d06230d196d0085222e337c27a55e1d359ca1642a1b8a680", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.netbsd-amd64" + "file": "buildx-v0.34.0.netbsd-amd64", + "sha256": "66f1c88d3f9dde6c8639b137e9f1f998cc0a37603d8c1df973ffa53fb9e07996", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.33.0.netbsd-arm64", - "sha256": "e5dcc84d68d77998b3b9f40ac845fde2f853580c9e77f7402c3d5df47e0742e0", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.netbsd-arm64" + "file": "buildx-v0.34.0.netbsd-arm64", + "sha256": "a93be61fe33e85876761373d27eb7a4a669c77ed62ef195ad0caa21a702dbb61", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.33.0.openbsd-amd64", - "sha256": "f9422b0ffc9c1ec349ebc7f48de678e335dcd25076dc82f53a54cc90d45f57aa", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.openbsd-amd64" + "file": "buildx-v0.34.0.openbsd-amd64", + "sha256": "d7d0390cde2b67b6e3724c9e8ddf352bbe44c57165b5b7f2c0575f22a3720a59", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.33.0.openbsd-arm64", - "sha256": "4d27f59815667fb82ed8cff4212d03028057bef69b062436a750d09fdfbe9599", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.openbsd-arm64" + "file": "buildx-v0.34.0.openbsd-arm64", + "sha256": "db61ee6dc8c7be818338b6b9c452ee958c23532be85a9796cc9dfd3e4989ec8b", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.33.0.linux-ppc64le", - "sha256": "46b0444858c8db8c6f741dca20b815f50046a2d73f4874a54dae2719df145ad3", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-ppc64le" + "file": "buildx-v0.34.0.linux-ppc64le", + "sha256": "c5ef8012f48a518e1c235ad408d26cd424d7b5fa87eaf78cb2ff4b9048730120", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.33.0.linux-riscv64", - "sha256": "5003b19409f2dfb38fc5f00a8eac4b1d810f6087b88ae007c6983287b93095dd", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-riscv64" + "file": "buildx-v0.34.0.linux-riscv64", + "sha256": "80b27d5f3a346591a5045b81217ee5be578ed151ef8cbd883a892c0ec0ac33f1", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.33.0.linux-s390x", - "sha256": "17fbec8163440e73d1e784d55faf483b17782aac471d867a525fa370f3ed317c", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.linux-s390x" + "file": "buildx-v0.34.0.linux-s390x", + "sha256": "04f5bd0d389f682c7e9287a3b3a1777b0848f8e10d58cbf9d4d12c9002bbb378", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.33.0.windows-amd64.exe", - "sha256": "832ddf42373203ee3836a7cb3b16fe5080231491e7edb32019ac0f6fe03b99ed", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-amd64.exe" + "file": "buildx-v0.34.0.windows-amd64.exe", + "sha256": "96a10e259fa1380e7bbf9a3cb04872f201a6e7e331ddeeec8d3e38aa2650ddc5", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.33.0.windows-arm64.exe", - "sha256": "3f7a8129e21faf8c860efd14bbf0feb714c0aac9ca9c08dc4b39b39455d0bcf1", - "url": "https://github.com/docker/buildx/releases/download/v0.33.0/buildx-v0.33.0.windows-arm64.exe" + "file": "buildx-v0.34.0.windows-arm64.exe", + "sha256": "86f5d9655e6f04c19210a696f9de1f6682e9bded9f0b71702ef4e5139eeffa5a", + "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.windows-arm64.exe" } }, - "version": "0.33.0" + "version": "0.34.0" }, "compose": { "arches": { From 55b0b1c61f6dfdae40139136e1425da87e60f376 Mon Sep 17 00:00:00 2001 From: yosifkit Date: Fri, 15 May 2026 14:15:25 -0700 Subject: [PATCH 594/667] Add 29.5.0 (#575) - drop vpnkit for 29.5+ https://github.com/moby/moby/pull/52319 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 11 +++++------ 29/dind/Dockerfile | 8 ++++---- 29/dind/dockerd-entrypoint.sh | 2 +- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- Dockerfile-dind-rootless.template | 7 +++---- dockerd-entrypoint.sh | 2 +- versions.json | 16 ++++++++-------- 9 files changed, 31 insertions(+), 33 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index b9c8feb5b..477e30978 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.4.3 +ENV DOCKER_VERSION 29.5.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.4.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.5.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 83bc3a632..3c55207b0 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -8,7 +8,8 @@ FROM docker:29-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 -# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +# slirp4netns is recommended as rootlesskit's net driver +# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns # "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR @@ -25,10 +26,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-29.4.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ @@ -40,12 +41,10 @@ RUN set -eux; \ --strip-components 1 \ --directory /usr/local/bin/ \ 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ ; \ rm rootless.tgz; \ \ - rootlesskit --version; \ - vpnkit --version + rootlesskit --version # pre-create "/var/lib/docker" for our rootless user RUN set -eux; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index b427e78c6..56b75c6c7 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.4.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.4.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.5.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.4.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.4.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/dockerd-entrypoint.sh b/29/dind/dockerd-entrypoint.sh index 8a291dfa5..77ff1aab3 100755 --- a/29/dind/dockerd-entrypoint.sh +++ b/29/dind/dockerd-entrypoint.sh @@ -218,7 +218,7 @@ if [ "$1" = 'dockerd' ]; then fi # TODO overlay support detection? exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ --disable-host-loopback \ --port-driver=builtin \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 9fdccf8f8..0c31a13e9 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.4.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.3.zip +ENV DOCKER_VERSION 29.5.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.0.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index c530950ae..1ffaf166f 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.4.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.4.3.zip +ENV DOCKER_VERSION 29.5.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.0.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/Dockerfile-dind-rootless.template b/Dockerfile-dind-rootless.template index 6f6d5c2a0..884fb56b0 100644 --- a/Dockerfile-dind-rootless.template +++ b/Dockerfile-dind-rootless.template @@ -3,7 +3,8 @@ FROM docker:{{ env.version }}-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 -# slirp4netns can be selected as rootlesskit's net driver using "-e DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns" +# slirp4netns is recommended as rootlesskit's net driver +# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns # "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR @@ -31,12 +32,10 @@ RUN set -eux; \ --strip-components 1 \ --directory /usr/local/bin/ \ 'docker-rootless-extras/rootlesskit' \ - 'docker-rootless-extras/vpnkit' \ ; \ rm rootless.tgz; \ \ - rootlesskit --version; \ - vpnkit --version + rootlesskit --version # pre-create "/var/lib/docker" for our rootless user RUN set -eux; \ diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 8a291dfa5..77ff1aab3 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -218,7 +218,7 @@ if [ "$1" = 'dockerd' ]; then fi # TODO overlay support detection? exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-vpnkit}" \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ --disable-host-loopback \ --port-driver=builtin \ diff --git a/versions.json b/versions.json index 9a4b4a4c3..1c4736c0e 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.4.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.4.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.5.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.4.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.5.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.4.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.5.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.4.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.4.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.5.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.4.3.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.5.0.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.4.3" + "version": "29.5.0" }, "29-rc": null } From 35de4e7ba643247c25cf6e92612860890e722b52 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 18 May 2026 14:24:24 -0700 Subject: [PATCH 595/667] Update 29 to 29.5.1 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 477e30978..67aa39d1f 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.5.0 +ENV DOCKER_VERSION 29.5.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.5.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 3c55207b0..51dc3e547 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 56b75c6c7..789d2e094 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.5.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 0c31a13e9..a30ffd02f 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.5.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.0.zip +ENV DOCKER_VERSION 29.5.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.1.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 1ffaf166f..b55e6341d 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.5.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.0.zip +ENV DOCKER_VERSION 29.5.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.1.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/versions.json b/versions.json index 1c4736c0e..bf11da911 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.5.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.5.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.5.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.5.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.5.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.5.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.5.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.5.1.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.5.0" + "version": "29.5.1" }, "29-rc": null } From 8824ad323ab2b4c37e391a4ae733f53a3de07b4a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 19 May 2026 15:04:13 -0700 Subject: [PATCH 596/667] Update 29 to buildx 0.34.1 --- 29/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 67aa39d1f..f3a9528c1 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.34.0 +ENV DOCKER_BUILDX_VERSION 0.34.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-amd64'; \ - sha256='0144479d5a1cd710be3464ae898628cfa68033e16b225aef52f81930c45ac9b5'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-amd64'; \ + sha256='f1332ddb9010bd0b72628266c3a906d9a6979848033df4c8d9bd2cd113bae12b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm-v6'; \ - sha256='1f34337385921c5da43d63452282726b062aa887fda975f96dd3d6e869648bc6'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v6'; \ + sha256='1f6c8a082281706a0b9e24b64b9210ca0df5273ceaf600536012e7a62d790538'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm-v7'; \ - sha256='3560b5b6fd3485f4d0bd160e7edf56cc1f08f0cb5852c9af28bf3fab9973c7c2'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v7'; \ + sha256='ad4e0938c94638ac882641b924f6eff6889cc59a11f062e733cf337458aa6f35'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm64'; \ - sha256='565605fe0bb393ed5d11771e5b52fc7ef05c701868861fa85609747c9d74a440'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm64'; \ + sha256='c34e32dd6ea2653d960d6c099c9f09b9077e4a37504d2d31e5066eccc3904231'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-ppc64le'; \ - sha256='c5ef8012f48a518e1c235ad408d26cd424d7b5fa87eaf78cb2ff4b9048730120'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-ppc64le'; \ + sha256='a509dc17005a4eee3568336d9e2479642e53b31110e039a8f5b4e6079744d0e2'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-riscv64'; \ - sha256='80b27d5f3a346591a5045b81217ee5be578ed151ef8cbd883a892c0ec0ac33f1'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-riscv64'; \ + sha256='c2cf15773a0610e6de34a04e9191b07915d0ea2afb381a37ac87f0dcb213b85a'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-s390x'; \ - sha256='04f5bd0d389f682c7e9287a3b3a1777b0848f8e10d58cbf9d4d12c9002bbb378'; \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-s390x'; \ + sha256='edb0e83d5a2fa8913d0af46385b648408b4776ee3241b4c15f92fcadbc72b550'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index a30ffd02f..1c3d8b7e4 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.34.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 96a10e259fa1380e7bbf9a3cb04872f201a6e7e331ddeeec8d3e38aa2650ddc5 +ENV DOCKER_BUILDX_VERSION 0.34.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index b55e6341d..10bbe59e5 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.34.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 96a10e259fa1380e7bbf9a3cb04872f201a6e7e331ddeeec8d3e38aa2650ddc5 +ENV DOCKER_BUILDX_VERSION 0.34.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index bf11da911..262710c9e 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.34.0.linux-amd64", - "sha256": "0144479d5a1cd710be3464ae898628cfa68033e16b225aef52f81930c45ac9b5", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-amd64" + "file": "buildx-v0.34.1.linux-amd64", + "sha256": "f1332ddb9010bd0b72628266c3a906d9a6979848033df4c8d9bd2cd113bae12b", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.34.0.linux-arm-v6", - "sha256": "1f34337385921c5da43d63452282726b062aa887fda975f96dd3d6e869648bc6", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm-v6" + "file": "buildx-v0.34.1.linux-arm-v6", + "sha256": "1f6c8a082281706a0b9e24b64b9210ca0df5273ceaf600536012e7a62d790538", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.34.0.linux-arm-v7", - "sha256": "3560b5b6fd3485f4d0bd160e7edf56cc1f08f0cb5852c9af28bf3fab9973c7c2", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm-v7" + "file": "buildx-v0.34.1.linux-arm-v7", + "sha256": "ad4e0938c94638ac882641b924f6eff6889cc59a11f062e733cf337458aa6f35", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.34.0.linux-arm64", - "sha256": "565605fe0bb393ed5d11771e5b52fc7ef05c701868861fa85609747c9d74a440", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-arm64" + "file": "buildx-v0.34.1.linux-arm64", + "sha256": "c34e32dd6ea2653d960d6c099c9f09b9077e4a37504d2d31e5066eccc3904231", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.34.0.freebsd-amd64", - "sha256": "00f6921d188661d66c3b8ab631e6344adcfa96934d707af837c650cedcbb4d9d", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.freebsd-amd64" + "file": "buildx-v0.34.1.freebsd-amd64", + "sha256": "707f62b33e6ccf97fae46f69ddf1e16307c63fb9fbd5e534ffb77d2ecd5c4cfc", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.34.0.freebsd-arm64", - "sha256": "8ae9d564c832ecfdeb0b92d2e2da8f1b705cdf53802894ec5fb70c7bbf4ce0a0", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.freebsd-arm64" + "file": "buildx-v0.34.1.freebsd-arm64", + "sha256": "f54ec82ecaf4322ed06434424604cb172b31633432a7357556133f15a18e3b1e", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.34.0.netbsd-amd64", - "sha256": "66f1c88d3f9dde6c8639b137e9f1f998cc0a37603d8c1df973ffa53fb9e07996", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.netbsd-amd64" + "file": "buildx-v0.34.1.netbsd-amd64", + "sha256": "12f4af59bb96d9077d6471362e9c4b6b022727eb927c67c8df75c7f7f9340f74", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.34.0.netbsd-arm64", - "sha256": "a93be61fe33e85876761373d27eb7a4a669c77ed62ef195ad0caa21a702dbb61", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.netbsd-arm64" + "file": "buildx-v0.34.1.netbsd-arm64", + "sha256": "e833e0c4bbbf9bc69988c421fbdc112fc7d6b6ecb7b2e8c4358a76c256ecb641", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.34.0.openbsd-amd64", - "sha256": "d7d0390cde2b67b6e3724c9e8ddf352bbe44c57165b5b7f2c0575f22a3720a59", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.openbsd-amd64" + "file": "buildx-v0.34.1.openbsd-amd64", + "sha256": "d8434b0e9d218a6ce1e86b1abc343a8522f87dbcffdbe97d3c6cf4e87f71430e", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.34.0.openbsd-arm64", - "sha256": "db61ee6dc8c7be818338b6b9c452ee958c23532be85a9796cc9dfd3e4989ec8b", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.openbsd-arm64" + "file": "buildx-v0.34.1.openbsd-arm64", + "sha256": "385c0e1205846819467edb361cd1115a398d81fbe43dc6afc153a054d541a617", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.34.0.linux-ppc64le", - "sha256": "c5ef8012f48a518e1c235ad408d26cd424d7b5fa87eaf78cb2ff4b9048730120", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-ppc64le" + "file": "buildx-v0.34.1.linux-ppc64le", + "sha256": "a509dc17005a4eee3568336d9e2479642e53b31110e039a8f5b4e6079744d0e2", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.34.0.linux-riscv64", - "sha256": "80b27d5f3a346591a5045b81217ee5be578ed151ef8cbd883a892c0ec0ac33f1", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-riscv64" + "file": "buildx-v0.34.1.linux-riscv64", + "sha256": "c2cf15773a0610e6de34a04e9191b07915d0ea2afb381a37ac87f0dcb213b85a", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.34.0.linux-s390x", - "sha256": "04f5bd0d389f682c7e9287a3b3a1777b0848f8e10d58cbf9d4d12c9002bbb378", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.linux-s390x" + "file": "buildx-v0.34.1.linux-s390x", + "sha256": "edb0e83d5a2fa8913d0af46385b648408b4776ee3241b4c15f92fcadbc72b550", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.34.0.windows-amd64.exe", - "sha256": "96a10e259fa1380e7bbf9a3cb04872f201a6e7e331ddeeec8d3e38aa2650ddc5", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.windows-amd64.exe" + "file": "buildx-v0.34.1.windows-amd64.exe", + "sha256": "41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.34.0.windows-arm64.exe", - "sha256": "86f5d9655e6f04c19210a696f9de1f6682e9bded9f0b71702ef4e5139eeffa5a", - "url": "https://github.com/docker/buildx/releases/download/v0.34.0/buildx-v0.34.0.windows-arm64.exe" + "file": "buildx-v0.34.1.windows-arm64.exe", + "sha256": "413e9cc2008e78e377c0f70b67f9f3da4708fec6c8baafbad51d0df4a65b4c11", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-arm64.exe" } }, - "version": "0.34.0" + "version": "0.34.1" }, "compose": { "arches": { From acc36e7a22c31f6a74a4d203aa1a6d89ce41d261 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 20 May 2026 09:04:12 -0700 Subject: [PATCH 597/667] Update 29 to compose 5.1.4 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index f3a9528c1..b51854111 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.1.3 +ENV DOCKER_COMPOSE_VERSION 5.1.4 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-x86_64'; \ - sha256='a0298760c9772d2c06888fc8703a487c94c3c3b0134adeef830742a2fc7647b4'; \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-x86_64'; \ + sha256='33b208d7e76639db742fae84b966cc01dacae58ca3fc4dabbc907045aefdf0c4'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-armv6'; \ - sha256='514fc01481017bf4ae55a3b1fe7d598ca49a930e346803648bd88dba9d4ae3da'; \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv6'; \ + sha256='38c8b500e75de30707024db9d135af979f4fdf6b9bae82b7a854b17eddad1205'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-armv7'; \ - sha256='4c1ce6ad43c184934a1f76cd55d7231192492c487acbd13e96258ed10fd9e468'; \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv7'; \ + sha256='5cce4229012b8b18067fba078c9ec4e2a5dd47cb4cb3a0cc3d431f6fc429060f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-aarch64'; \ - sha256='e8105a3e687ea7e0b0f81abe4bf9269c8a2801fb72c2b498b5ff2472bc54145f'; \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-aarch64'; \ + sha256='d4fb48b72857810314d3ee77123c89954101844efa4788031221f4c370495946'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-ppc64le'; \ - sha256='ceaa1a9f24ef471e6f9fc34b30d11dcb6d8021a9a283c5e7261521ef12951432'; \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-ppc64le'; \ + sha256='044a5a6eac8ba3b686e5ad74d529293372eb6d8553685738fe93ae6a6fd92790'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-riscv64'; \ - sha256='f4a01e52ab7b14bc88e0657f6c477274f151c7907cfe6a5362709f7bd4814c44'; \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-riscv64'; \ + sha256='03565cf8e16b3afa6fd6555d697b3237ea2d4dbd5547ab6835bc90fa7e5e00bb'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-s390x'; \ - sha256='552d11a594aa3d81b4b69a2abd2a5c2e699378038a8efaa8200c0b556be3451f'; \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-s390x'; \ + sha256='5bd0db672b07bb86272e84bbddd286f42fe9b84080e4d47ad3a91a84bd8c2c3d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 1c3d8b7e4..27ad28e32 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5e6d72612b3165be9fea4ae889435fec76979a9779b6f62f4efee99dd5f41ea1 +ENV DOCKER_COMPOSE_VERSION 5.1.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 10bbe59e5..46ac39a03 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.3 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 5e6d72612b3165be9fea4ae889435fec76979a9779b6f62f4efee99dd5f41ea1 +ENV DOCKER_COMPOSE_VERSION 5.1.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 262710c9e..6eea20b50 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "a0298760c9772d2c06888fc8703a487c94c3c3b0134adeef830742a2fc7647b4", - "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-x86_64" + "sha256": "33b208d7e76639db742fae84b966cc01dacae58ca3fc4dabbc907045aefdf0c4", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "514fc01481017bf4ae55a3b1fe7d598ca49a930e346803648bd88dba9d4ae3da", - "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-armv6" + "sha256": "38c8b500e75de30707024db9d135af979f4fdf6b9bae82b7a854b17eddad1205", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "4c1ce6ad43c184934a1f76cd55d7231192492c487acbd13e96258ed10fd9e468", - "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-armv7" + "sha256": "5cce4229012b8b18067fba078c9ec4e2a5dd47cb4cb3a0cc3d431f6fc429060f", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "e8105a3e687ea7e0b0f81abe4bf9269c8a2801fb72c2b498b5ff2472bc54145f", - "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-aarch64" + "sha256": "d4fb48b72857810314d3ee77123c89954101844efa4788031221f4c370495946", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "f11139d9822ce1f3843e16ed6c2e44ba5525423396c82fa22b08874b26abd102", - "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-darwin-x86_64" + "sha256": "c6f6915295918b59c2848e8978612691fdbbef05cae8cae3b78b10aec3e3dbc7", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "b8461a8a53f7e0ce677139516b17661e7ccd54ac4f2dabae03ad79f2f2ae35c6", - "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-darwin-aarch64" + "sha256": "4cad7fc67dd089a598a15598ad38d04e6f23bf299846d26b2c572f1f96a7c49f", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "ceaa1a9f24ef471e6f9fc34b30d11dcb6d8021a9a283c5e7261521ef12951432", - "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-ppc64le" + "sha256": "044a5a6eac8ba3b686e5ad74d529293372eb6d8553685738fe93ae6a6fd92790", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "f4a01e52ab7b14bc88e0657f6c477274f151c7907cfe6a5362709f7bd4814c44", - "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-riscv64" + "sha256": "03565cf8e16b3afa6fd6555d697b3237ea2d4dbd5547ab6835bc90fa7e5e00bb", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "552d11a594aa3d81b4b69a2abd2a5c2e699378038a8efaa8200c0b556be3451f", - "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-linux-s390x" + "sha256": "5bd0db672b07bb86272e84bbddd286f42fe9b84080e4d47ad3a91a84bd8c2c3d", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "5e6d72612b3165be9fea4ae889435fec76979a9779b6f62f4efee99dd5f41ea1", - "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-windows-x86_64.exe" + "sha256": "e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "9bdabc5fb175161b93c41b2ce6464b816f8d2614e6b9641f5e0fdf20b188f4a2", - "url": "https://github.com/docker/compose/releases/download/v5.1.3/docker-compose-windows-aarch64.exe" + "sha256": "11992bc5de81d7df994bdf58a4eead433f1c287c15965056a3b372ae38888aaf", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-aarch64.exe" } }, - "version": "5.1.3" + "version": "5.1.4" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From bc9e03bd1093d09d4aa4c3d74ca0a1d42acdc3e8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 20 May 2026 15:04:14 -0700 Subject: [PATCH 598/667] Update 29 to 29.5.2 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index b51854111..b5f9e5843 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.5.1 +ENV DOCKER_VERSION 29.5.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.5.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 51dc3e547..f77444c91 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 789d2e094..ac9603010 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.5.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 27ad28e32..cff04fa4a 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.5.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.1.zip +ENV DOCKER_VERSION 29.5.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.2.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 46ac39a03..7034d4bb1 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.5.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.1.zip +ENV DOCKER_VERSION 29.5.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.2.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/versions.json b/versions.json index 6eea20b50..ba52b13e7 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.5.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.5.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.5.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.5.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.5.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.5.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.5.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.5.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.5.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.5.2.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.5.1" + "version": "29.5.2" }, "29-rc": null } From f3c8a6a2fa4b39191a6911a6d1a674d9c8d3e312 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 3 Jun 2026 15:04:17 -0700 Subject: [PATCH 599/667] Update 29 to 29.5.3 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index b5f9e5843..847b92d2f 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.5.2 +ENV DOCKER_VERSION 29.5.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.5.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.5.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index f77444c91..51d8d37ca 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.5.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index ac9603010..6b5cd1c69 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.5.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.5.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index cff04fa4a..ae20dd692 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.5.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.2.zip +ENV DOCKER_VERSION 29.5.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.3.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 7034d4bb1..acad5a3f6 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.5.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.2.zip +ENV DOCKER_VERSION 29.5.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.3.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/versions.json b/versions.json index ba52b13e7..885b67622 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.5.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.5.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.5.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.5.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.5.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.5.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.5.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.5.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.5.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.5.3.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.5.2" + "version": "29.5.3" }, "29-rc": null } From e9c27b5271d20314cf67d83c1b27bb7c7dd87fc9 Mon Sep 17 00:00:00 2001 From: Jenthe Noordsij Date: Wed, 10 Jun 2026 09:02:26 +0200 Subject: [PATCH 600/667] Update to Alpine 3.24 --- 29/cli/Dockerfile | 2 +- 29/dind/Dockerfile | 2 +- Dockerfile-cli.template | 2 +- Dockerfile-dind.template | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 847b92d2f..e44f0316a 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.23 +FROM alpine:3.24 RUN apk add --no-cache \ ca-certificates \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 6b5cd1c69..ba2ed7fd3 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -40,7 +40,7 @@ RUN set -eux; \ ip6tables-restore \ ; do \ # "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.23&name=iptables-legacy&arch=x86_64 +# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 b="$(command -v "${f/tables/tables-legacy}")"; \ "$b" --version; \ ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 64b8fff34..101e75358 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -1,5 +1,5 @@ {{ include "shared" -}} -FROM alpine:3.23 +FROM alpine:3.24 RUN apk add --no-cache \ ca-certificates \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index ee4ec1c69..75d30e7df 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -35,7 +35,7 @@ RUN set -eux; \ ip6tables-restore \ ; do \ # "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.23&name=iptables-legacy&arch=x86_64 +# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 b="$(command -v "${f/tables/tables-legacy}")"; \ "$b" --version; \ ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ From d9286789b3839a0aa976f2694e886415425d767d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 12 Jun 2026 15:04:18 -0700 Subject: [PATCH 601/667] Update 29-rc to 29.6.0-rc.1, buildx 0.34.1, compose 5.1.4 --- 29-rc/cli/Dockerfile | 167 ++++++++++++ 29-rc/cli/docker-entrypoint.sh | 61 +++++ 29-rc/cli/modprobe.sh | 20 ++ 29-rc/dind-rootless/Dockerfile | 54 ++++ 29-rc/dind/Dockerfile | 108 ++++++++ 29-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 171 ++++++++++++- 9 files changed, 1000 insertions(+), 1 deletion(-) create mode 100644 29-rc/cli/Dockerfile create mode 100755 29-rc/cli/docker-entrypoint.sh create mode 100755 29-rc/cli/modprobe.sh create mode 100644 29-rc/dind-rootless/Dockerfile create mode 100644 29-rc/dind/Dockerfile create mode 100755 29-rc/dind/dockerd-entrypoint.sh create mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile new file mode 100644 index 000000000..1878b7d87 --- /dev/null +++ b/29-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.24 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 29.6.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.6.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.6.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.6.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.6.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.34.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-amd64'; \ + sha256='f1332ddb9010bd0b72628266c3a906d9a6979848033df4c8d9bd2cd113bae12b'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v6'; \ + sha256='1f6c8a082281706a0b9e24b64b9210ca0df5273ceaf600536012e7a62d790538'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v7'; \ + sha256='ad4e0938c94638ac882641b924f6eff6889cc59a11f062e733cf337458aa6f35'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm64'; \ + sha256='c34e32dd6ea2653d960d6c099c9f09b9077e4a37504d2d31e5066eccc3904231'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-ppc64le'; \ + sha256='a509dc17005a4eee3568336d9e2479642e53b31110e039a8f5b4e6079744d0e2'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-riscv64'; \ + sha256='c2cf15773a0610e6de34a04e9191b07915d0ea2afb381a37ac87f0dcb213b85a'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-s390x'; \ + sha256='edb0e83d5a2fa8913d0af46385b648408b4776ee3241b4c15f92fcadbc72b550'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 5.1.4 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-x86_64'; \ + sha256='33b208d7e76639db742fae84b966cc01dacae58ca3fc4dabbc907045aefdf0c4'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv6'; \ + sha256='38c8b500e75de30707024db9d135af979f4fdf6b9bae82b7a854b17eddad1205'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv7'; \ + sha256='5cce4229012b8b18067fba078c9ec4e2a5dd47cb4cb3a0cc3d431f6fc429060f'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-aarch64'; \ + sha256='d4fb48b72857810314d3ee77123c89954101844efa4788031221f4c370495946'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-ppc64le'; \ + sha256='044a5a6eac8ba3b686e5ad74d529293372eb6d8553685738fe93ae6a6fd92790'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-riscv64'; \ + sha256='03565cf8e16b3afa6fd6555d697b3237ea2d4dbd5547ab6835bc90fa7e5e00bb'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-s390x'; \ + sha256='5bd0db672b07bb86272e84bbddd286f42fe9b84080e4d47ad3a91a84bd8c2c3d'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/29-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/29-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..4f27fff99 --- /dev/null +++ b/29-rc/dind-rootless/Dockerfile @@ -0,0 +1,54 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-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 +# slirp4netns is recommended as rootlesskit's net driver +# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.6.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.6.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile new file mode 100644 index 000000000..0af36e95a --- /dev/null +++ b/29-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.6.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.6.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.6.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.6.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..77ff1aab3 --- /dev/null +++ b/29-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..1127cdf0e --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.6.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.6.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.34.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.1.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..608360afc --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.6.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.6.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.34.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.1.4 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 885b67622..99511f0fa 100644 --- a/versions.json +++ b/versions.json @@ -169,5 +169,174 @@ ], "version": "29.5.3" }, - "29-rc": null + "29-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.6.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.6.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.6.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.6.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.6.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.6.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.6.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.34.1.linux-amd64", + "sha256": "f1332ddb9010bd0b72628266c3a906d9a6979848033df4c8d9bd2cd113bae12b", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.34.1.linux-arm-v6", + "sha256": "1f6c8a082281706a0b9e24b64b9210ca0df5273ceaf600536012e7a62d790538", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.34.1.linux-arm-v7", + "sha256": "ad4e0938c94638ac882641b924f6eff6889cc59a11f062e733cf337458aa6f35", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.34.1.linux-arm64", + "sha256": "c34e32dd6ea2653d960d6c099c9f09b9077e4a37504d2d31e5066eccc3904231", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.34.1.freebsd-amd64", + "sha256": "707f62b33e6ccf97fae46f69ddf1e16307c63fb9fbd5e534ffb77d2ecd5c4cfc", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.34.1.freebsd-arm64", + "sha256": "f54ec82ecaf4322ed06434424604cb172b31633432a7357556133f15a18e3b1e", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.34.1.netbsd-amd64", + "sha256": "12f4af59bb96d9077d6471362e9c4b6b022727eb927c67c8df75c7f7f9340f74", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.34.1.netbsd-arm64", + "sha256": "e833e0c4bbbf9bc69988c421fbdc112fc7d6b6ecb7b2e8c4358a76c256ecb641", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.34.1.openbsd-amd64", + "sha256": "d8434b0e9d218a6ce1e86b1abc343a8522f87dbcffdbe97d3c6cf4e87f71430e", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.34.1.openbsd-arm64", + "sha256": "385c0e1205846819467edb361cd1115a398d81fbe43dc6afc153a054d541a617", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.34.1.linux-ppc64le", + "sha256": "a509dc17005a4eee3568336d9e2479642e53b31110e039a8f5b4e6079744d0e2", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.34.1.linux-riscv64", + "sha256": "c2cf15773a0610e6de34a04e9191b07915d0ea2afb381a37ac87f0dcb213b85a", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.34.1.linux-s390x", + "sha256": "edb0e83d5a2fa8913d0af46385b648408b4776ee3241b4c15f92fcadbc72b550", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.34.1.windows-amd64.exe", + "sha256": "41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.34.1.windows-arm64.exe", + "sha256": "413e9cc2008e78e377c0f70b67f9f3da4708fec6c8baafbad51d0df4a65b4c11", + "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-arm64.exe" + } + }, + "version": "0.34.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "33b208d7e76639db742fae84b966cc01dacae58ca3fc4dabbc907045aefdf0c4", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "38c8b500e75de30707024db9d135af979f4fdf6b9bae82b7a854b17eddad1205", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "5cce4229012b8b18067fba078c9ec4e2a5dd47cb4cb3a0cc3d431f6fc429060f", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "d4fb48b72857810314d3ee77123c89954101844efa4788031221f4c370495946", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "c6f6915295918b59c2848e8978612691fdbbef05cae8cae3b78b10aec3e3dbc7", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "4cad7fc67dd089a598a15598ad38d04e6f23bf299846d26b2c572f1f96a7c49f", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "044a5a6eac8ba3b686e5ad74d529293372eb6d8553685738fe93ae6a6fd92790", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "03565cf8e16b3afa6fd6555d697b3237ea2d4dbd5547ab6835bc90fa7e5e00bb", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "5bd0db672b07bb86272e84bbddd286f42fe9b84080e4d47ad3a91a84bd8c2c3d", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "11992bc5de81d7df994bdf58a4eead433f1c287c15965056a3b372ae38888aaf", + "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-aarch64.exe" + } + }, + "version": "5.1.4" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "29.6.0-rc.1" + } } From 5350b877f0dbc74c54c82f1b244d285ae6a677bb Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Jun 2026 21:04:12 -0700 Subject: [PATCH 602/667] Update 29 to buildx 0.35.0 --- 29/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index e44f0316a..921b680db 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.34.1 +ENV DOCKER_BUILDX_VERSION 0.35.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-amd64'; \ - sha256='f1332ddb9010bd0b72628266c3a906d9a6979848033df4c8d9bd2cd113bae12b'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64'; \ + sha256='d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v6'; \ - sha256='1f6c8a082281706a0b9e24b64b9210ca0df5273ceaf600536012e7a62d790538'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6'; \ + sha256='5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v7'; \ - sha256='ad4e0938c94638ac882641b924f6eff6889cc59a11f062e733cf337458aa6f35'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7'; \ + sha256='e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm64'; \ - sha256='c34e32dd6ea2653d960d6c099c9f09b9077e4a37504d2d31e5066eccc3904231'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64'; \ + sha256='c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-ppc64le'; \ - sha256='a509dc17005a4eee3568336d9e2479642e53b31110e039a8f5b4e6079744d0e2'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le'; \ + sha256='bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-riscv64'; \ - sha256='c2cf15773a0610e6de34a04e9191b07915d0ea2afb381a37ac87f0dcb213b85a'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64'; \ + sha256='3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-s390x'; \ - sha256='edb0e83d5a2fa8913d0af46385b648408b4776ee3241b4c15f92fcadbc72b550'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x'; \ + sha256='ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index ae20dd692..b7e39e5f7 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.34.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1 +ENV DOCKER_BUILDX_VERSION 0.35.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index acad5a3f6..8de5b0dbd 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.34.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1 +ENV DOCKER_BUILDX_VERSION 0.35.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 99511f0fa..bdab164cb 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.34.1.linux-amd64", - "sha256": "f1332ddb9010bd0b72628266c3a906d9a6979848033df4c8d9bd2cd113bae12b", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-amd64" + "file": "buildx-v0.35.0.linux-amd64", + "sha256": "d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.34.1.linux-arm-v6", - "sha256": "1f6c8a082281706a0b9e24b64b9210ca0df5273ceaf600536012e7a62d790538", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v6" + "file": "buildx-v0.35.0.linux-arm-v6", + "sha256": "5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.34.1.linux-arm-v7", - "sha256": "ad4e0938c94638ac882641b924f6eff6889cc59a11f062e733cf337458aa6f35", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v7" + "file": "buildx-v0.35.0.linux-arm-v7", + "sha256": "e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.34.1.linux-arm64", - "sha256": "c34e32dd6ea2653d960d6c099c9f09b9077e4a37504d2d31e5066eccc3904231", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm64" + "file": "buildx-v0.35.0.linux-arm64", + "sha256": "c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.34.1.freebsd-amd64", - "sha256": "707f62b33e6ccf97fae46f69ddf1e16307c63fb9fbd5e534ffb77d2ecd5c4cfc", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.freebsd-amd64" + "file": "buildx-v0.35.0.freebsd-amd64", + "sha256": "4ff6414c7f25c9ce48b91302977f59c1cac5b25e08ee51af9afa1a491531d175", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.34.1.freebsd-arm64", - "sha256": "f54ec82ecaf4322ed06434424604cb172b31633432a7357556133f15a18e3b1e", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.freebsd-arm64" + "file": "buildx-v0.35.0.freebsd-arm64", + "sha256": "4ab6447c27abca22fcaa5c0b28952cc599363dbd5221fa883f99427b19ed4e7f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.34.1.netbsd-amd64", - "sha256": "12f4af59bb96d9077d6471362e9c4b6b022727eb927c67c8df75c7f7f9340f74", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.netbsd-amd64" + "file": "buildx-v0.35.0.netbsd-amd64", + "sha256": "990bf0e95b8a57d33a8f9600f824ebf81530d5d326238216eda490184598f6f4", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.34.1.netbsd-arm64", - "sha256": "e833e0c4bbbf9bc69988c421fbdc112fc7d6b6ecb7b2e8c4358a76c256ecb641", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.netbsd-arm64" + "file": "buildx-v0.35.0.netbsd-arm64", + "sha256": "6fc0167ca94eeab2c7bb6b921cf5e3c3925de356d74f72c2582df6f433fa7412", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.34.1.openbsd-amd64", - "sha256": "d8434b0e9d218a6ce1e86b1abc343a8522f87dbcffdbe97d3c6cf4e87f71430e", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.openbsd-amd64" + "file": "buildx-v0.35.0.openbsd-amd64", + "sha256": "8354dbce0b93256da02dda416825f582ef730a21cd6d55f3e2a54f14039f41fa", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.34.1.openbsd-arm64", - "sha256": "385c0e1205846819467edb361cd1115a398d81fbe43dc6afc153a054d541a617", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.openbsd-arm64" + "file": "buildx-v0.35.0.openbsd-arm64", + "sha256": "cdfd44e2072acff1d41796753074c50bb144537a2401d221fc0455ed9a78f76f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.34.1.linux-ppc64le", - "sha256": "a509dc17005a4eee3568336d9e2479642e53b31110e039a8f5b4e6079744d0e2", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-ppc64le" + "file": "buildx-v0.35.0.linux-ppc64le", + "sha256": "bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.34.1.linux-riscv64", - "sha256": "c2cf15773a0610e6de34a04e9191b07915d0ea2afb381a37ac87f0dcb213b85a", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-riscv64" + "file": "buildx-v0.35.0.linux-riscv64", + "sha256": "3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.34.1.linux-s390x", - "sha256": "edb0e83d5a2fa8913d0af46385b648408b4776ee3241b4c15f92fcadbc72b550", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-s390x" + "file": "buildx-v0.35.0.linux-s390x", + "sha256": "ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.34.1.windows-amd64.exe", - "sha256": "41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe" + "file": "buildx-v0.35.0.windows-amd64.exe", + "sha256": "8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.34.1.windows-arm64.exe", - "sha256": "413e9cc2008e78e377c0f70b67f9f3da4708fec6c8baafbad51d0df4a65b4c11", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-arm64.exe" + "file": "buildx-v0.35.0.windows-arm64.exe", + "sha256": "ae03abd184e69ecefd9b751cdd5862db6d4822c2d27861b5b059fe6c1722681a", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-arm64.exe" } }, - "version": "0.34.1" + "version": "0.35.0" }, "compose": { "arches": { From ed7627ea174b6d69afab96a4804403d54139e23b Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 17 Jun 2026 21:06:29 -0700 Subject: [PATCH 603/667] Update 29-rc to buildx 0.35.0 --- 29-rc/cli/Dockerfile | 30 +++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 92 +++++++++---------- 4 files changed, 67 insertions(+), 67 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 1878b7d87..59b112d63 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.34.1 +ENV DOCKER_BUILDX_VERSION 0.35.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-amd64'; \ - sha256='f1332ddb9010bd0b72628266c3a906d9a6979848033df4c8d9bd2cd113bae12b'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64'; \ + sha256='d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v6'; \ - sha256='1f6c8a082281706a0b9e24b64b9210ca0df5273ceaf600536012e7a62d790538'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6'; \ + sha256='5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v7'; \ - sha256='ad4e0938c94638ac882641b924f6eff6889cc59a11f062e733cf337458aa6f35'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7'; \ + sha256='e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm64'; \ - sha256='c34e32dd6ea2653d960d6c099c9f09b9077e4a37504d2d31e5066eccc3904231'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64'; \ + sha256='c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-ppc64le'; \ - sha256='a509dc17005a4eee3568336d9e2479642e53b31110e039a8f5b4e6079744d0e2'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le'; \ + sha256='bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-riscv64'; \ - sha256='c2cf15773a0610e6de34a04e9191b07915d0ea2afb381a37ac87f0dcb213b85a'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64'; \ + sha256='3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-s390x'; \ - sha256='edb0e83d5a2fa8913d0af46385b648408b4776ee3241b4c15f92fcadbc72b550'; \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x'; \ + sha256='ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 1127cdf0e..eada131b5 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.34.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1 +ENV DOCKER_BUILDX_VERSION 0.35.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 608360afc..c96509935 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.34.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1 +ENV DOCKER_BUILDX_VERSION 0.35.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index bdab164cb..2b392fff1 100644 --- a/versions.json +++ b/versions.json @@ -192,82 +192,82 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.34.1.linux-amd64", - "sha256": "f1332ddb9010bd0b72628266c3a906d9a6979848033df4c8d9bd2cd113bae12b", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-amd64" + "file": "buildx-v0.35.0.linux-amd64", + "sha256": "d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.34.1.linux-arm-v6", - "sha256": "1f6c8a082281706a0b9e24b64b9210ca0df5273ceaf600536012e7a62d790538", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v6" + "file": "buildx-v0.35.0.linux-arm-v6", + "sha256": "5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.34.1.linux-arm-v7", - "sha256": "ad4e0938c94638ac882641b924f6eff6889cc59a11f062e733cf337458aa6f35", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm-v7" + "file": "buildx-v0.35.0.linux-arm-v7", + "sha256": "e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.34.1.linux-arm64", - "sha256": "c34e32dd6ea2653d960d6c099c9f09b9077e4a37504d2d31e5066eccc3904231", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-arm64" + "file": "buildx-v0.35.0.linux-arm64", + "sha256": "c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.34.1.freebsd-amd64", - "sha256": "707f62b33e6ccf97fae46f69ddf1e16307c63fb9fbd5e534ffb77d2ecd5c4cfc", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.freebsd-amd64" + "file": "buildx-v0.35.0.freebsd-amd64", + "sha256": "4ff6414c7f25c9ce48b91302977f59c1cac5b25e08ee51af9afa1a491531d175", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.34.1.freebsd-arm64", - "sha256": "f54ec82ecaf4322ed06434424604cb172b31633432a7357556133f15a18e3b1e", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.freebsd-arm64" + "file": "buildx-v0.35.0.freebsd-arm64", + "sha256": "4ab6447c27abca22fcaa5c0b28952cc599363dbd5221fa883f99427b19ed4e7f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.34.1.netbsd-amd64", - "sha256": "12f4af59bb96d9077d6471362e9c4b6b022727eb927c67c8df75c7f7f9340f74", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.netbsd-amd64" + "file": "buildx-v0.35.0.netbsd-amd64", + "sha256": "990bf0e95b8a57d33a8f9600f824ebf81530d5d326238216eda490184598f6f4", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.34.1.netbsd-arm64", - "sha256": "e833e0c4bbbf9bc69988c421fbdc112fc7d6b6ecb7b2e8c4358a76c256ecb641", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.netbsd-arm64" + "file": "buildx-v0.35.0.netbsd-arm64", + "sha256": "6fc0167ca94eeab2c7bb6b921cf5e3c3925de356d74f72c2582df6f433fa7412", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.34.1.openbsd-amd64", - "sha256": "d8434b0e9d218a6ce1e86b1abc343a8522f87dbcffdbe97d3c6cf4e87f71430e", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.openbsd-amd64" + "file": "buildx-v0.35.0.openbsd-amd64", + "sha256": "8354dbce0b93256da02dda416825f582ef730a21cd6d55f3e2a54f14039f41fa", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.34.1.openbsd-arm64", - "sha256": "385c0e1205846819467edb361cd1115a398d81fbe43dc6afc153a054d541a617", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.openbsd-arm64" + "file": "buildx-v0.35.0.openbsd-arm64", + "sha256": "cdfd44e2072acff1d41796753074c50bb144537a2401d221fc0455ed9a78f76f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.34.1.linux-ppc64le", - "sha256": "a509dc17005a4eee3568336d9e2479642e53b31110e039a8f5b4e6079744d0e2", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-ppc64le" + "file": "buildx-v0.35.0.linux-ppc64le", + "sha256": "bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.34.1.linux-riscv64", - "sha256": "c2cf15773a0610e6de34a04e9191b07915d0ea2afb381a37ac87f0dcb213b85a", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-riscv64" + "file": "buildx-v0.35.0.linux-riscv64", + "sha256": "3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.34.1.linux-s390x", - "sha256": "edb0e83d5a2fa8913d0af46385b648408b4776ee3241b4c15f92fcadbc72b550", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.linux-s390x" + "file": "buildx-v0.35.0.linux-s390x", + "sha256": "ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.34.1.windows-amd64.exe", - "sha256": "41e1b3fff6541d5f5febb18ff4c9108bec30afd7bf9133b82783735c2078eac1", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-amd64.exe" + "file": "buildx-v0.35.0.windows-amd64.exe", + "sha256": "8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.34.1.windows-arm64.exe", - "sha256": "413e9cc2008e78e377c0f70b67f9f3da4708fec6c8baafbad51d0df4a65b4c11", - "url": "https://github.com/docker/buildx/releases/download/v0.34.1/buildx-v0.34.1.windows-arm64.exe" + "file": "buildx-v0.35.0.windows-arm64.exe", + "sha256": "ae03abd184e69ecefd9b751cdd5862db6d4822c2d27861b5b059fe6c1722681a", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-arm64.exe" } }, - "version": "0.34.1" + "version": "0.35.0" }, "compose": { "arches": { From cc8105227cc57abf66bf4333b1a8c8a6e5ee942a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Jun 2026 15:04:15 -0700 Subject: [PATCH 604/667] Update 29 to 29.6.0 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 921b680db..d9873a3b9 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.5.3 +ENV DOCKER_VERSION 29.6.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.5.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.6.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 51d8d37ca..867fcced2 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.5.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.6.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index ba2ed7fd3..bc3cc2a8f 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.5.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.5.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.6.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.5.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.5.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index b7e39e5f7..b847a1cf3 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.5.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.3.zip +ENV DOCKER_VERSION 29.6.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.0.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 8de5b0dbd..6768887da 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.5.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.5.3.zip +ENV DOCKER_VERSION 29.6.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.0.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/versions.json b/versions.json index 2b392fff1..8e9d42c8b 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.5.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.5.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.6.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.6.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.5.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.6.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.5.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.6.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.5.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.5.3.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.6.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.5.3.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.6.0.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.5.3" + "version": "29.6.0" }, "29-rc": { "arches": { From c1664ee72160549cf5caa20cedccb69817e73bed Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 18 Jun 2026 15:06:13 -0700 Subject: [PATCH 605/667] Update 29-rc --- 29-rc/cli/Dockerfile | 167 ------------ 29-rc/cli/docker-entrypoint.sh | 61 ----- 29-rc/cli/modprobe.sh | 20 -- 29-rc/dind-rootless/Dockerfile | 54 ---- 29-rc/dind/Dockerfile | 108 -------- 29-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 171 +------------ 9 files changed, 1 insertion(+), 1000 deletions(-) delete mode 100644 29-rc/cli/Dockerfile delete mode 100755 29-rc/cli/docker-entrypoint.sh delete mode 100755 29-rc/cli/modprobe.sh delete mode 100644 29-rc/dind-rootless/Dockerfile delete mode 100644 29-rc/dind/Dockerfile delete mode 100755 29-rc/dind/dockerd-entrypoint.sh delete mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile deleted file mode 100644 index 59b112d63..000000000 --- a/29-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.24 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 29.6.0-rc.1 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.6.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.6.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.6.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.6.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.35.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64'; \ - sha256='d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6'; \ - sha256='5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7'; \ - sha256='e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64'; \ - sha256='c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le'; \ - sha256='bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64'; \ - sha256='3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x'; \ - sha256='ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 5.1.4 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-x86_64'; \ - sha256='33b208d7e76639db742fae84b966cc01dacae58ca3fc4dabbc907045aefdf0c4'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv6'; \ - sha256='38c8b500e75de30707024db9d135af979f4fdf6b9bae82b7a854b17eddad1205'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv7'; \ - sha256='5cce4229012b8b18067fba078c9ec4e2a5dd47cb4cb3a0cc3d431f6fc429060f'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-aarch64'; \ - sha256='d4fb48b72857810314d3ee77123c89954101844efa4788031221f4c370495946'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-ppc64le'; \ - sha256='044a5a6eac8ba3b686e5ad74d529293372eb6d8553685738fe93ae6a6fd92790'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-riscv64'; \ - sha256='03565cf8e16b3afa6fd6555d697b3237ea2d4dbd5547ab6835bc90fa7e5e00bb'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-s390x'; \ - sha256='5bd0db672b07bb86272e84bbddd286f42fe9b84080e4d47ad3a91a84bd8c2c3d'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/29-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/29-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile deleted file mode 100644 index 4f27fff99..000000000 --- a/29-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-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 -# slirp4netns is recommended as rootlesskit's net driver -# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.6.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.6.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile deleted file mode 100644 index 0af36e95a..000000000 --- a/29-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.6.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.6.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.6.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.6.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 77ff1aab3..000000000 --- a/29-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index eada131b5..000000000 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.6.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.6.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.35.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index c96509935..000000000 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.6.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.6.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.35.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 8e9d42c8b..31e6c7147 100644 --- a/versions.json +++ b/versions.json @@ -169,174 +169,5 @@ ], "version": "29.6.0" }, - "29-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.6.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.6.0-rc.1.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.6.0-rc.1.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.6.0-rc.1.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.6.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.6.0-rc.1.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.6.0-rc.1.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.35.0.linux-amd64", - "sha256": "d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.35.0.linux-arm-v6", - "sha256": "5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.35.0.linux-arm-v7", - "sha256": "e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.35.0.linux-arm64", - "sha256": "c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.35.0.freebsd-amd64", - "sha256": "4ff6414c7f25c9ce48b91302977f59c1cac5b25e08ee51af9afa1a491531d175", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.35.0.freebsd-arm64", - "sha256": "4ab6447c27abca22fcaa5c0b28952cc599363dbd5221fa883f99427b19ed4e7f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.35.0.netbsd-amd64", - "sha256": "990bf0e95b8a57d33a8f9600f824ebf81530d5d326238216eda490184598f6f4", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.35.0.netbsd-arm64", - "sha256": "6fc0167ca94eeab2c7bb6b921cf5e3c3925de356d74f72c2582df6f433fa7412", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.35.0.openbsd-amd64", - "sha256": "8354dbce0b93256da02dda416825f582ef730a21cd6d55f3e2a54f14039f41fa", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.35.0.openbsd-arm64", - "sha256": "cdfd44e2072acff1d41796753074c50bb144537a2401d221fc0455ed9a78f76f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.35.0.linux-ppc64le", - "sha256": "bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.35.0.linux-riscv64", - "sha256": "3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.35.0.linux-s390x", - "sha256": "ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.35.0.windows-amd64.exe", - "sha256": "8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.35.0.windows-arm64.exe", - "sha256": "ae03abd184e69ecefd9b751cdd5862db6d4822c2d27861b5b059fe6c1722681a", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-arm64.exe" - } - }, - "version": "0.35.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "33b208d7e76639db742fae84b966cc01dacae58ca3fc4dabbc907045aefdf0c4", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "38c8b500e75de30707024db9d135af979f4fdf6b9bae82b7a854b17eddad1205", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "5cce4229012b8b18067fba078c9ec4e2a5dd47cb4cb3a0cc3d431f6fc429060f", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "d4fb48b72857810314d3ee77123c89954101844efa4788031221f4c370495946", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "c6f6915295918b59c2848e8978612691fdbbef05cae8cae3b78b10aec3e3dbc7", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "4cad7fc67dd089a598a15598ad38d04e6f23bf299846d26b2c572f1f96a7c49f", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "044a5a6eac8ba3b686e5ad74d529293372eb6d8553685738fe93ae6a6fd92790", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "03565cf8e16b3afa6fd6555d697b3237ea2d4dbd5547ab6835bc90fa7e5e00bb", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "5bd0db672b07bb86272e84bbddd286f42fe9b84080e4d47ad3a91a84bd8c2c3d", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "11992bc5de81d7df994bdf58a4eead433f1c287c15965056a3b372ae38888aaf", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-aarch64.exe" - } - }, - "version": "5.1.4" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "29.6.0-rc.1" - } + "29-rc": null } From a59281e4a859ddb0a73f3bff6911c8ba80a56ae5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 23 Jun 2026 09:04:13 -0700 Subject: [PATCH 606/667] Update 29 to compose 5.2.0 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index d9873a3b9..965aa692d 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.1.4 +ENV DOCKER_COMPOSE_VERSION 5.2.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-x86_64'; \ - sha256='33b208d7e76639db742fae84b966cc01dacae58ca3fc4dabbc907045aefdf0c4'; \ + url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-x86_64'; \ + sha256='018f9612ecabc5f2d7aaa53d6f5f44453a87611e2d72c8ef84d7b1eca070e719'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv6'; \ - sha256='38c8b500e75de30707024db9d135af979f4fdf6b9bae82b7a854b17eddad1205'; \ + url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-armv6'; \ + sha256='ce15dafabdceb12b0e136fcf71e8fdd3e7f35407da9ab2591db4097fd56327bc'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv7'; \ - sha256='5cce4229012b8b18067fba078c9ec4e2a5dd47cb4cb3a0cc3d431f6fc429060f'; \ + url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-armv7'; \ + sha256='e202edcce184f5e17219e2defa8263580729c7e939133f8d703daecd461cb37e'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-aarch64'; \ - sha256='d4fb48b72857810314d3ee77123c89954101844efa4788031221f4c370495946'; \ + url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-aarch64'; \ + sha256='739de570a0adf5eab12830db980f549fb5f44ad6b266e1e43e20f6f9df7cbcca'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-ppc64le'; \ - sha256='044a5a6eac8ba3b686e5ad74d529293372eb6d8553685738fe93ae6a6fd92790'; \ + url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-ppc64le'; \ + sha256='0dfd397c75da17215b8dc9382878807fdbaea0b5cf6084fb96ac656ea0940c38'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-riscv64'; \ - sha256='03565cf8e16b3afa6fd6555d697b3237ea2d4dbd5547ab6835bc90fa7e5e00bb'; \ + url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-riscv64'; \ + sha256='9aa503f95e94381ffbc34a26a7dd31dca4e96ba795daa1ed26735572400a17ce'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-s390x'; \ - sha256='5bd0db672b07bb86272e84bbddd286f42fe9b84080e4d47ad3a91a84bd8c2c3d'; \ + url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-s390x'; \ + sha256='aedc25e71397e16a2e7d3cf20929c5095909e7f75686875087c65c2279de847c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index b847a1cf3..e05a612a0 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa +ENV DOCKER_COMPOSE_VERSION 5.2.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 90c81af6cd12227d84665b01e14a89b07920c42d6d04e8f6f391a415f7a8d6a4 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 6768887da..ae437563c 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.1.4 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa +ENV DOCKER_COMPOSE_VERSION 5.2.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 90c81af6cd12227d84665b01e14a89b07920c42d6d04e8f6f391a415f7a8d6a4 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 31e6c7147..4241e2272 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "33b208d7e76639db742fae84b966cc01dacae58ca3fc4dabbc907045aefdf0c4", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-x86_64" + "sha256": "018f9612ecabc5f2d7aaa53d6f5f44453a87611e2d72c8ef84d7b1eca070e719", + "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "38c8b500e75de30707024db9d135af979f4fdf6b9bae82b7a854b17eddad1205", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv6" + "sha256": "ce15dafabdceb12b0e136fcf71e8fdd3e7f35407da9ab2591db4097fd56327bc", + "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "5cce4229012b8b18067fba078c9ec4e2a5dd47cb4cb3a0cc3d431f6fc429060f", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-armv7" + "sha256": "e202edcce184f5e17219e2defa8263580729c7e939133f8d703daecd461cb37e", + "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "d4fb48b72857810314d3ee77123c89954101844efa4788031221f4c370495946", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-aarch64" + "sha256": "739de570a0adf5eab12830db980f549fb5f44ad6b266e1e43e20f6f9df7cbcca", + "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c6f6915295918b59c2848e8978612691fdbbef05cae8cae3b78b10aec3e3dbc7", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-darwin-x86_64" + "sha256": "527066ba67f92ce9e0939c7107d4a41ebb2fa30d67ee786e364168c71ca870fa", + "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "4cad7fc67dd089a598a15598ad38d04e6f23bf299846d26b2c572f1f96a7c49f", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-darwin-aarch64" + "sha256": "2262c26ccef8dd0815bf3d16f0c82537424295abd374b68561f58fcee458fdd7", + "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "044a5a6eac8ba3b686e5ad74d529293372eb6d8553685738fe93ae6a6fd92790", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-ppc64le" + "sha256": "0dfd397c75da17215b8dc9382878807fdbaea0b5cf6084fb96ac656ea0940c38", + "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "03565cf8e16b3afa6fd6555d697b3237ea2d4dbd5547ab6835bc90fa7e5e00bb", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-riscv64" + "sha256": "9aa503f95e94381ffbc34a26a7dd31dca4e96ba795daa1ed26735572400a17ce", + "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "5bd0db672b07bb86272e84bbddd286f42fe9b84080e4d47ad3a91a84bd8c2c3d", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-linux-s390x" + "sha256": "aedc25e71397e16a2e7d3cf20929c5095909e7f75686875087c65c2279de847c", + "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e1a8faff28c7433635201a2222171b727f33ecdb0ed367e54d162d00432f39aa", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-x86_64.exe" + "sha256": "90c81af6cd12227d84665b01e14a89b07920c42d6d04e8f6f391a415f7a8d6a4", + "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "11992bc5de81d7df994bdf58a4eead433f1c287c15965056a3b372ae38888aaf", - "url": "https://github.com/docker/compose/releases/download/v5.1.4/docker-compose-windows-aarch64.exe" + "sha256": "709692084ee7d5066113cb9dbc2fbc26eda503f52d51b08ffd263f2e0eb56a41", + "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-windows-aarch64.exe" } }, - "version": "5.1.4" + "version": "5.2.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 526b3465d7bd3e11eb6718e682d3ea1f341fc7fd Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 26 Jun 2026 09:04:13 -0700 Subject: [PATCH 607/667] Update 29 to 29.6.1 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 965aa692d..ae8420749 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.6.0 +ENV DOCKER_VERSION 29.6.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.6.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.6.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 867fcced2..7e587b9f1 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.6.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.6.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index bc3cc2a8f..c86038954 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.6.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.6.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index e05a612a0..b926b0066 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.6.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.0.zip +ENV DOCKER_VERSION 29.6.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.1.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index ae437563c..82a7f4a66 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.6.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.0.zip +ENV DOCKER_VERSION 29.6.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.1.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/versions.json b/versions.json index 4241e2272..ef9f2f999 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.6.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.6.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.6.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.6.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.6.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.6.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.6.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.6.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.6.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.6.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.6.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.6.1.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.6.0" + "version": "29.6.1" }, "29-rc": null } From b966f22208da5f854d0fe48cd2b665ce2772ade1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 2 Jul 2026 03:04:13 -0700 Subject: [PATCH 608/667] Update 29 to compose 5.3.0 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index ae8420749..d7a9887f2 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.2.0 +ENV DOCKER_COMPOSE_VERSION 5.3.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-x86_64'; \ - sha256='018f9612ecabc5f2d7aaa53d6f5f44453a87611e2d72c8ef84d7b1eca070e719'; \ + url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-x86_64'; \ + sha256='fffb010206c952ee5e45d0cd05dc88d3ca063c4634d40eaad6b72677c4c7bbf0'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-armv6'; \ - sha256='ce15dafabdceb12b0e136fcf71e8fdd3e7f35407da9ab2591db4097fd56327bc'; \ + url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-armv6'; \ + sha256='3489c2bc3350b80cb1118d73118ab142f9600e7662e6a5bab37783505c8bf44f'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-armv7'; \ - sha256='e202edcce184f5e17219e2defa8263580729c7e939133f8d703daecd461cb37e'; \ + url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-armv7'; \ + sha256='e2c012e67d9e13e6a359da7a48f3550b1628985f4880921a707cfd2b7392e3cf'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-aarch64'; \ - sha256='739de570a0adf5eab12830db980f549fb5f44ad6b266e1e43e20f6f9df7cbcca'; \ + url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-aarch64'; \ + sha256='ba0d9f5ce70086b3830448ce2f8a6405513c996065fe45d2f7c144a1f0d99398'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-ppc64le'; \ - sha256='0dfd397c75da17215b8dc9382878807fdbaea0b5cf6084fb96ac656ea0940c38'; \ + url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-ppc64le'; \ + sha256='365513ff365f39127c7a9cf51437b61a8fd56b416647191d22b8313feb9fc8eb'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-riscv64'; \ - sha256='9aa503f95e94381ffbc34a26a7dd31dca4e96ba795daa1ed26735572400a17ce'; \ + url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-riscv64'; \ + sha256='03dea9e87c766c6fe46abd1306f0f41e3016af3dd561165d586368236f3e19c0'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-s390x'; \ - sha256='aedc25e71397e16a2e7d3cf20929c5095909e7f75686875087c65c2279de847c'; \ + url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-s390x'; \ + sha256='1647e4509172b658c59bbfd7e10bcc0c2ae25840f19bf8a8bf6fe0702a002a43'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index b926b0066..7bc4bfda9 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.2.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 90c81af6cd12227d84665b01e14a89b07920c42d6d04e8f6f391a415f7a8d6a4 +ENV DOCKER_COMPOSE_VERSION 5.3.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eac499928bcfdeaf0fe3dc9a783eb0ba5293188a2458c38730030e92a2759a20 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 82a7f4a66..997785d7b 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.2.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 90c81af6cd12227d84665b01e14a89b07920c42d6d04e8f6f391a415f7a8d6a4 +ENV DOCKER_COMPOSE_VERSION 5.3.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 eac499928bcfdeaf0fe3dc9a783eb0ba5293188a2458c38730030e92a2759a20 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ef9f2f999..ed8517189 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "018f9612ecabc5f2d7aaa53d6f5f44453a87611e2d72c8ef84d7b1eca070e719", - "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-x86_64" + "sha256": "fffb010206c952ee5e45d0cd05dc88d3ca063c4634d40eaad6b72677c4c7bbf0", + "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "ce15dafabdceb12b0e136fcf71e8fdd3e7f35407da9ab2591db4097fd56327bc", - "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-armv6" + "sha256": "3489c2bc3350b80cb1118d73118ab142f9600e7662e6a5bab37783505c8bf44f", + "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "e202edcce184f5e17219e2defa8263580729c7e939133f8d703daecd461cb37e", - "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-armv7" + "sha256": "e2c012e67d9e13e6a359da7a48f3550b1628985f4880921a707cfd2b7392e3cf", + "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "739de570a0adf5eab12830db980f549fb5f44ad6b266e1e43e20f6f9df7cbcca", - "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-aarch64" + "sha256": "ba0d9f5ce70086b3830448ce2f8a6405513c996065fe45d2f7c144a1f0d99398", + "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "527066ba67f92ce9e0939c7107d4a41ebb2fa30d67ee786e364168c71ca870fa", - "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-darwin-x86_64" + "sha256": "cb7d0ca7d526ee57940f42c912136348b4aca8ddcacf2a716c578cb2762fed30", + "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "2262c26ccef8dd0815bf3d16f0c82537424295abd374b68561f58fcee458fdd7", - "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-darwin-aarch64" + "sha256": "222d80fe371b22b397308b0a2562436af1c6ba0448cd6298ca52cd6d9c7e67de", + "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "0dfd397c75da17215b8dc9382878807fdbaea0b5cf6084fb96ac656ea0940c38", - "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-ppc64le" + "sha256": "365513ff365f39127c7a9cf51437b61a8fd56b416647191d22b8313feb9fc8eb", + "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "9aa503f95e94381ffbc34a26a7dd31dca4e96ba795daa1ed26735572400a17ce", - "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-riscv64" + "sha256": "03dea9e87c766c6fe46abd1306f0f41e3016af3dd561165d586368236f3e19c0", + "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "aedc25e71397e16a2e7d3cf20929c5095909e7f75686875087c65c2279de847c", - "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-linux-s390x" + "sha256": "1647e4509172b658c59bbfd7e10bcc0c2ae25840f19bf8a8bf6fe0702a002a43", + "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "90c81af6cd12227d84665b01e14a89b07920c42d6d04e8f6f391a415f7a8d6a4", - "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-windows-x86_64.exe" + "sha256": "eac499928bcfdeaf0fe3dc9a783eb0ba5293188a2458c38730030e92a2759a20", + "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "709692084ee7d5066113cb9dbc2fbc26eda503f52d51b08ffd263f2e0eb56a41", - "url": "https://github.com/docker/compose/releases/download/v5.2.0/docker-compose-windows-aarch64.exe" + "sha256": "c69ee136cd6c3318cf2683a722fb4d1dec38c992d5e0cb2e2e06f0b1499018da", + "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-windows-aarch64.exe" } }, - "version": "5.2.0" + "version": "5.3.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 22153729f8e66965453369679338e94e614e1d96 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 7 Jul 2026 09:04:15 -0700 Subject: [PATCH 609/667] Update 29 to compose 5.3.1 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index d7a9887f2..5aeea6742 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.3.0 +ENV DOCKER_COMPOSE_VERSION 5.3.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-x86_64'; \ - sha256='fffb010206c952ee5e45d0cd05dc88d3ca063c4634d40eaad6b72677c4c7bbf0'; \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-x86_64'; \ + sha256='f9ebc6ebdb19d769b793c245a736caaeb198c62587f13b25c660c13b4987f959'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-armv6'; \ - sha256='3489c2bc3350b80cb1118d73118ab142f9600e7662e6a5bab37783505c8bf44f'; \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv6'; \ + sha256='899607529e5e752cbdaec84b73e994378cf8f27f3d626a5a6df56f7511c00304'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-armv7'; \ - sha256='e2c012e67d9e13e6a359da7a48f3550b1628985f4880921a707cfd2b7392e3cf'; \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv7'; \ + sha256='69276acb37ea70023cf85a8180e869c0cfc8cb5a3e672821400aa58dea56e2e8'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-aarch64'; \ - sha256='ba0d9f5ce70086b3830448ce2f8a6405513c996065fe45d2f7c144a1f0d99398'; \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-aarch64'; \ + sha256='aa611e811d0ea25897839c404bfb5bf93ce706dc51c500a4457890f5d0606a86'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-ppc64le'; \ - sha256='365513ff365f39127c7a9cf51437b61a8fd56b416647191d22b8313feb9fc8eb'; \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-ppc64le'; \ + sha256='3280a0dcc7874c2a564ca1224c5669364bc1a5d83ae7153a9c0182fd76fd2102'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-riscv64'; \ - sha256='03dea9e87c766c6fe46abd1306f0f41e3016af3dd561165d586368236f3e19c0'; \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-riscv64'; \ + sha256='e237f165e0fd5472d147db274f0fb5dcdaab4384c36634178307f4c8e965d904'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-s390x'; \ - sha256='1647e4509172b658c59bbfd7e10bcc0c2ae25840f19bf8a8bf6fe0702a002a43'; \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-s390x'; \ + sha256='3889c8d1677bee347297c8f0a73bc517b5c35da18781812942aef8a87eac9011'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 7bc4bfda9..7373a084f 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.3.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eac499928bcfdeaf0fe3dc9a783eb0ba5293188a2458c38730030e92a2759a20 +ENV DOCKER_COMPOSE_VERSION 5.3.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 997785d7b..eafc0b989 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.3.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 eac499928bcfdeaf0fe3dc9a783eb0ba5293188a2458c38730030e92a2759a20 +ENV DOCKER_COMPOSE_VERSION 5.3.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ed8517189..df2de4115 100644 --- a/versions.json +++ b/versions.json @@ -103,61 +103,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "fffb010206c952ee5e45d0cd05dc88d3ca063c4634d40eaad6b72677c4c7bbf0", - "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-x86_64" + "sha256": "f9ebc6ebdb19d769b793c245a736caaeb198c62587f13b25c660c13b4987f959", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "3489c2bc3350b80cb1118d73118ab142f9600e7662e6a5bab37783505c8bf44f", - "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-armv6" + "sha256": "899607529e5e752cbdaec84b73e994378cf8f27f3d626a5a6df56f7511c00304", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "e2c012e67d9e13e6a359da7a48f3550b1628985f4880921a707cfd2b7392e3cf", - "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-armv7" + "sha256": "69276acb37ea70023cf85a8180e869c0cfc8cb5a3e672821400aa58dea56e2e8", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "ba0d9f5ce70086b3830448ce2f8a6405513c996065fe45d2f7c144a1f0d99398", - "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-aarch64" + "sha256": "aa611e811d0ea25897839c404bfb5bf93ce706dc51c500a4457890f5d0606a86", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "cb7d0ca7d526ee57940f42c912136348b4aca8ddcacf2a716c578cb2762fed30", - "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-darwin-x86_64" + "sha256": "56620a2e87e789147b9b1cc5d37eeecec2332e2cdf5c2d58a68f999f2dc416ca", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "222d80fe371b22b397308b0a2562436af1c6ba0448cd6298ca52cd6d9c7e67de", - "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-darwin-aarch64" + "sha256": "32691ba1196d819fa68cbdc0aad9a5569e730a35ae40c6fdd8458110ecd69488", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "365513ff365f39127c7a9cf51437b61a8fd56b416647191d22b8313feb9fc8eb", - "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-ppc64le" + "sha256": "3280a0dcc7874c2a564ca1224c5669364bc1a5d83ae7153a9c0182fd76fd2102", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "03dea9e87c766c6fe46abd1306f0f41e3016af3dd561165d586368236f3e19c0", - "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-riscv64" + "sha256": "e237f165e0fd5472d147db274f0fb5dcdaab4384c36634178307f4c8e965d904", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "1647e4509172b658c59bbfd7e10bcc0c2ae25840f19bf8a8bf6fe0702a002a43", - "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-linux-s390x" + "sha256": "3889c8d1677bee347297c8f0a73bc517b5c35da18781812942aef8a87eac9011", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "eac499928bcfdeaf0fe3dc9a783eb0ba5293188a2458c38730030e92a2759a20", - "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-windows-x86_64.exe" + "sha256": "6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "c69ee136cd6c3318cf2683a722fb4d1dec38c992d5e0cb2e2e06f0b1499018da", - "url": "https://github.com/docker/compose/releases/download/v5.3.0/docker-compose-windows-aarch64.exe" + "sha256": "5871699d19ee22904f7d1a7ce7e9e6b5a582f6cf9286afd0117ad601cc6737d6", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-aarch64.exe" } }, - "version": "5.3.0" + "version": "5.3.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 5b8430f91266d61c469b835aadb9ae2aa068bd27 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 16 Jul 2026 15:04:19 -0700 Subject: [PATCH 610/667] Update 29 to 29.6.2 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 5aeea6742..210651b1f 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.6.1 +ENV DOCKER_VERSION 29.6.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.6.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.6.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 7e587b9f1..e47d9b488 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.6.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.6.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index c86038954..86a9557c7 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.6.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.6.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 7373a084f..6a0eb399b 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.6.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.1.zip +ENV DOCKER_VERSION 29.6.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.2.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index eafc0b989..20b7e3909 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.6.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.1.zip +ENV DOCKER_VERSION 29.6.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.2.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/versions.json b/versions.json index df2de4115..15e295f78 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.6.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.6.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.6.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.6.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.6.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.6.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.6.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.6.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.6.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.6.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.6.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.6.2.zip" } }, "buildx": { @@ -167,7 +167,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.6.1" + "version": "29.6.2" }, "29-rc": null } From f193ec4b2cd631e969ad7f2bdec6461882608912 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 28 Jul 2026 03:04:18 -0700 Subject: [PATCH 611/667] Update 29-rc to 29.7.0-rc.1, buildx 0.35.0, compose 5.3.1 --- 29-rc/cli/Dockerfile | 167 ++++++++++++ 29-rc/cli/docker-entrypoint.sh | 61 +++++ 29-rc/cli/modprobe.sh | 20 ++ 29-rc/dind-rootless/Dockerfile | 54 ++++ 29-rc/dind/Dockerfile | 108 ++++++++ 29-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 171 ++++++++++++- 9 files changed, 1000 insertions(+), 1 deletion(-) create mode 100644 29-rc/cli/Dockerfile create mode 100755 29-rc/cli/docker-entrypoint.sh create mode 100755 29-rc/cli/modprobe.sh create mode 100644 29-rc/dind-rootless/Dockerfile create mode 100644 29-rc/dind/Dockerfile create mode 100755 29-rc/dind/dockerd-entrypoint.sh create mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile new file mode 100644 index 000000000..a3a14e821 --- /dev/null +++ b/29-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.24 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 29.7.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.7.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.7.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.7.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.7.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.35.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64'; \ + sha256='d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6'; \ + sha256='5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7'; \ + sha256='e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64'; \ + sha256='c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le'; \ + sha256='bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64'; \ + sha256='3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x'; \ + sha256='ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 5.3.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-x86_64'; \ + sha256='f9ebc6ebdb19d769b793c245a736caaeb198c62587f13b25c660c13b4987f959'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv6'; \ + sha256='899607529e5e752cbdaec84b73e994378cf8f27f3d626a5a6df56f7511c00304'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv7'; \ + sha256='69276acb37ea70023cf85a8180e869c0cfc8cb5a3e672821400aa58dea56e2e8'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-aarch64'; \ + sha256='aa611e811d0ea25897839c404bfb5bf93ce706dc51c500a4457890f5d0606a86'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-ppc64le'; \ + sha256='3280a0dcc7874c2a564ca1224c5669364bc1a5d83ae7153a9c0182fd76fd2102'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-riscv64'; \ + sha256='e237f165e0fd5472d147db274f0fb5dcdaab4384c36634178307f4c8e965d904'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-s390x'; \ + sha256='3889c8d1677bee347297c8f0a73bc517b5c35da18781812942aef8a87eac9011'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/29-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/29-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..c21fda0bb --- /dev/null +++ b/29-rc/dind-rootless/Dockerfile @@ -0,0 +1,54 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-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 +# slirp4netns is recommended as rootlesskit's net driver +# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.7.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.7.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile new file mode 100644 index 000000000..2fabcc2fa --- /dev/null +++ b/29-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.7.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.7.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.7.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.7.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..77ff1aab3 --- /dev/null +++ b/29-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..065935b78 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.7.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.7.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.35.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.3.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..de405ea23 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.7.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.7.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.35.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.3.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 15e295f78..f22ed7010 100644 --- a/versions.json +++ b/versions.json @@ -169,5 +169,174 @@ ], "version": "29.6.2" }, - "29-rc": null + "29-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.7.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.7.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.7.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.7.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.7.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.7.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.7.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.35.0.linux-amd64", + "sha256": "d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.35.0.linux-arm-v6", + "sha256": "5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.35.0.linux-arm-v7", + "sha256": "e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.35.0.linux-arm64", + "sha256": "c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.35.0.freebsd-amd64", + "sha256": "4ff6414c7f25c9ce48b91302977f59c1cac5b25e08ee51af9afa1a491531d175", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.35.0.freebsd-arm64", + "sha256": "4ab6447c27abca22fcaa5c0b28952cc599363dbd5221fa883f99427b19ed4e7f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.35.0.netbsd-amd64", + "sha256": "990bf0e95b8a57d33a8f9600f824ebf81530d5d326238216eda490184598f6f4", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.35.0.netbsd-arm64", + "sha256": "6fc0167ca94eeab2c7bb6b921cf5e3c3925de356d74f72c2582df6f433fa7412", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.35.0.openbsd-amd64", + "sha256": "8354dbce0b93256da02dda416825f582ef730a21cd6d55f3e2a54f14039f41fa", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.35.0.openbsd-arm64", + "sha256": "cdfd44e2072acff1d41796753074c50bb144537a2401d221fc0455ed9a78f76f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.35.0.linux-ppc64le", + "sha256": "bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.35.0.linux-riscv64", + "sha256": "3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.35.0.linux-s390x", + "sha256": "ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.35.0.windows-amd64.exe", + "sha256": "8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.35.0.windows-arm64.exe", + "sha256": "ae03abd184e69ecefd9b751cdd5862db6d4822c2d27861b5b059fe6c1722681a", + "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-arm64.exe" + } + }, + "version": "0.35.0" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "f9ebc6ebdb19d769b793c245a736caaeb198c62587f13b25c660c13b4987f959", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "899607529e5e752cbdaec84b73e994378cf8f27f3d626a5a6df56f7511c00304", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "69276acb37ea70023cf85a8180e869c0cfc8cb5a3e672821400aa58dea56e2e8", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "aa611e811d0ea25897839c404bfb5bf93ce706dc51c500a4457890f5d0606a86", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "56620a2e87e789147b9b1cc5d37eeecec2332e2cdf5c2d58a68f999f2dc416ca", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "32691ba1196d819fa68cbdc0aad9a5569e730a35ae40c6fdd8458110ecd69488", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "3280a0dcc7874c2a564ca1224c5669364bc1a5d83ae7153a9c0182fd76fd2102", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "e237f165e0fd5472d147db274f0fb5dcdaab4384c36634178307f4c8e965d904", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "3889c8d1677bee347297c8f0a73bc517b5c35da18781812942aef8a87eac9011", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "5871699d19ee22904f7d1a7ce7e9e6b5a582f6cf9286afd0117ad601cc6737d6", + "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-aarch64.exe" + } + }, + "version": "5.3.1" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "29.7.0-rc.1" + } } From 0ddcd31abc61f8cad0190bb15eab814c1403b225 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 29 Jul 2026 15:04:24 -0700 Subject: [PATCH 612/667] Update 29 to buildx 0.36.0 --- 29/cli/Dockerfile | 30 +++---- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 90 +++++++++---------- 4 files changed, 61 insertions(+), 71 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 210651b1f..00b7d0d00 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.35.0 +ENV DOCKER_BUILDX_VERSION 0.36.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64'; \ - sha256='d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-amd64'; \ + sha256='07823fdfcd82a41be90155a8b16876c1a780a6462de805a9f3f63b3119ccfb99'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6'; \ - sha256='5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v6'; \ + sha256='6d87680eab65cb2b8c3bba602406a40f718b77eb8e3af10994db794e3deada37'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7'; \ - sha256='e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v7'; \ + sha256='50527239ba76f72e9ffd8227a2e265c6751f71e4908546f0f68c329e87b2c71c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64'; \ - sha256='c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm64'; \ + sha256='70382de03915c07c488ae4ddc4f7e169ee978f953e754ecfce110ba017e0132b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le'; \ - sha256='bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-ppc64le'; \ + sha256='ebd3c6c77e649c759986380e1281d38b50bd4afe88fec2076ea48c56b1e08227'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64'; \ - sha256='3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-riscv64'; \ + sha256='8b2b242d512e77f711028af53f8501241fceb22a80a8f5e7368a27375cf805a7'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x'; \ - sha256='ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-s390x'; \ + sha256='7c00dc2644ff428779d075aa080d046397511797d1c8475dce9f3c3471965a04'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 6a0eb399b..9b1cd0b12 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.35.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe +ENV DOCKER_BUILDX_VERSION 0.36.0 +ENV DOCKER_BUILDX_URL +ENV DOCKER_BUILDX_SHA256 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 20b7e3909..e979287ff 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.35.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe +ENV DOCKER_BUILDX_VERSION 0.36.0 +ENV DOCKER_BUILDX_URL +ENV DOCKER_BUILDX_SHA256 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f22ed7010..ceabb9229 100644 --- a/versions.json +++ b/versions.json @@ -22,82 +22,72 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.35.0.linux-amd64", - "sha256": "d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64" + "file": "buildx-v0.36.0.linux-amd64", + "sha256": "07823fdfcd82a41be90155a8b16876c1a780a6462de805a9f3f63b3119ccfb99", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.35.0.linux-arm-v6", - "sha256": "5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6" + "file": "buildx-v0.36.0.linux-arm-v6", + "sha256": "6d87680eab65cb2b8c3bba602406a40f718b77eb8e3af10994db794e3deada37", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.35.0.linux-arm-v7", - "sha256": "e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7" + "file": "buildx-v0.36.0.linux-arm-v7", + "sha256": "50527239ba76f72e9ffd8227a2e265c6751f71e4908546f0f68c329e87b2c71c", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.35.0.linux-arm64", - "sha256": "c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64" + "file": "buildx-v0.36.0.linux-arm64", + "sha256": "70382de03915c07c488ae4ddc4f7e169ee978f953e754ecfce110ba017e0132b", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.35.0.freebsd-amd64", - "sha256": "4ff6414c7f25c9ce48b91302977f59c1cac5b25e08ee51af9afa1a491531d175", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-amd64" + "file": "buildx-v0.36.0.freebsd-amd64", + "sha256": "ec18dd9ba32bfaa0c41bbe43183c8dc26190ec9e6e4219b2f615220eea70da7d", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.35.0.freebsd-arm64", - "sha256": "4ab6447c27abca22fcaa5c0b28952cc599363dbd5221fa883f99427b19ed4e7f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-arm64" + "file": "buildx-v0.36.0.freebsd-arm64", + "sha256": "ff3ea4d5fed7bfae94a8c0810786c60969134bb82b4a757c65aa4310c8446f45", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.35.0.netbsd-amd64", - "sha256": "990bf0e95b8a57d33a8f9600f824ebf81530d5d326238216eda490184598f6f4", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-amd64" + "file": "buildx-v0.36.0.netbsd-amd64", + "sha256": "038d8bffb09c1c60cad4c78142b9fc9f0fe53584ff7000d525dab7aab0189669", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.35.0.netbsd-arm64", - "sha256": "6fc0167ca94eeab2c7bb6b921cf5e3c3925de356d74f72c2582df6f433fa7412", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-arm64" + "file": "buildx-v0.36.0.netbsd-arm64", + "sha256": "437424f216eba07710f36a18afab34ffa2118dfa9d0c919c49107975d217792d", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.35.0.openbsd-amd64", - "sha256": "8354dbce0b93256da02dda416825f582ef730a21cd6d55f3e2a54f14039f41fa", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-amd64" + "file": "buildx-v0.36.0.openbsd-amd64", + "sha256": "a3e00092a5b8e4f563a25fa9a2874da36bfaffe9ee0c2032e5423eeefad31bc2", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.35.0.openbsd-arm64", - "sha256": "cdfd44e2072acff1d41796753074c50bb144537a2401d221fc0455ed9a78f76f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-arm64" + "file": "buildx-v0.36.0.openbsd-arm64", + "sha256": "42a1f8d766e2aa1309177337b6d0ede1ac3c13e953b962a10b109ed9cd6dba76", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.35.0.linux-ppc64le", - "sha256": "bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le" + "file": "buildx-v0.36.0.linux-ppc64le", + "sha256": "ebd3c6c77e649c759986380e1281d38b50bd4afe88fec2076ea48c56b1e08227", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.35.0.linux-riscv64", - "sha256": "3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64" + "file": "buildx-v0.36.0.linux-riscv64", + "sha256": "8b2b242d512e77f711028af53f8501241fceb22a80a8f5e7368a27375cf805a7", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.35.0.linux-s390x", - "sha256": "ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.35.0.windows-amd64.exe", - "sha256": "8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.35.0.windows-arm64.exe", - "sha256": "ae03abd184e69ecefd9b751cdd5862db6d4822c2d27861b5b059fe6c1722681a", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-arm64.exe" + "file": "buildx-v0.36.0.linux-s390x", + "sha256": "7c00dc2644ff428779d075aa080d046397511797d1c8475dce9f3c3471965a04", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-s390x" } }, - "version": "0.35.0" + "version": "0.36.0" }, "compose": { "arches": { From b0d5cfcefc4713fead42a484908d150fe8e2fd59 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 29 Jul 2026 15:05:46 -0700 Subject: [PATCH 613/667] Update 29-rc to buildx 0.36.0 --- 29-rc/cli/Dockerfile | 30 +++---- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 90 +++++++++---------- 4 files changed, 61 insertions(+), 71 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index a3a14e821..49f433447 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.35.0 +ENV DOCKER_BUILDX_VERSION 0.36.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64'; \ - sha256='d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-amd64'; \ + sha256='07823fdfcd82a41be90155a8b16876c1a780a6462de805a9f3f63b3119ccfb99'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6'; \ - sha256='5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v6'; \ + sha256='6d87680eab65cb2b8c3bba602406a40f718b77eb8e3af10994db794e3deada37'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7'; \ - sha256='e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v7'; \ + sha256='50527239ba76f72e9ffd8227a2e265c6751f71e4908546f0f68c329e87b2c71c'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64'; \ - sha256='c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm64'; \ + sha256='70382de03915c07c488ae4ddc4f7e169ee978f953e754ecfce110ba017e0132b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le'; \ - sha256='bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-ppc64le'; \ + sha256='ebd3c6c77e649c759986380e1281d38b50bd4afe88fec2076ea48c56b1e08227'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64'; \ - sha256='3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-riscv64'; \ + sha256='8b2b242d512e77f711028af53f8501241fceb22a80a8f5e7368a27375cf805a7'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x'; \ - sha256='ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-s390x'; \ + sha256='7c00dc2644ff428779d075aa080d046397511797d1c8475dce9f3c3471965a04'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 065935b78..dc468a27c 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.35.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe +ENV DOCKER_BUILDX_VERSION 0.36.0 +ENV DOCKER_BUILDX_URL +ENV DOCKER_BUILDX_SHA256 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index de405ea23..11f81aa26 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.35.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe +ENV DOCKER_BUILDX_VERSION 0.36.0 +ENV DOCKER_BUILDX_URL +ENV DOCKER_BUILDX_SHA256 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ceabb9229..ffac3db15 100644 --- a/versions.json +++ b/versions.json @@ -182,82 +182,72 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.35.0.linux-amd64", - "sha256": "d41ece72044243b4f58b343441ae37446d9c29a7d6b5e11c61847bbcf8f7dfda", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-amd64" + "file": "buildx-v0.36.0.linux-amd64", + "sha256": "07823fdfcd82a41be90155a8b16876c1a780a6462de805a9f3f63b3119ccfb99", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.35.0.linux-arm-v6", - "sha256": "5938b81dc6203361bb984e961fc0afbcdc2bf05c5a666ec093ea99e612de616c", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v6" + "file": "buildx-v0.36.0.linux-arm-v6", + "sha256": "6d87680eab65cb2b8c3bba602406a40f718b77eb8e3af10994db794e3deada37", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.35.0.linux-arm-v7", - "sha256": "e1fe67cbe2d5a7b242e5f732a9708e6abaa6d19d717e65bfbd1d13baa8669d1f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm-v7" + "file": "buildx-v0.36.0.linux-arm-v7", + "sha256": "50527239ba76f72e9ffd8227a2e265c6751f71e4908546f0f68c329e87b2c71c", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.35.0.linux-arm64", - "sha256": "c4248d6cbc4a619a7e0b4609c11e509ad4ac0b475e1c64817c0ac20c5d90c766", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-arm64" + "file": "buildx-v0.36.0.linux-arm64", + "sha256": "70382de03915c07c488ae4ddc4f7e169ee978f953e754ecfce110ba017e0132b", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.35.0.freebsd-amd64", - "sha256": "4ff6414c7f25c9ce48b91302977f59c1cac5b25e08ee51af9afa1a491531d175", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-amd64" + "file": "buildx-v0.36.0.freebsd-amd64", + "sha256": "ec18dd9ba32bfaa0c41bbe43183c8dc26190ec9e6e4219b2f615220eea70da7d", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.35.0.freebsd-arm64", - "sha256": "4ab6447c27abca22fcaa5c0b28952cc599363dbd5221fa883f99427b19ed4e7f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.freebsd-arm64" + "file": "buildx-v0.36.0.freebsd-arm64", + "sha256": "ff3ea4d5fed7bfae94a8c0810786c60969134bb82b4a757c65aa4310c8446f45", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.35.0.netbsd-amd64", - "sha256": "990bf0e95b8a57d33a8f9600f824ebf81530d5d326238216eda490184598f6f4", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-amd64" + "file": "buildx-v0.36.0.netbsd-amd64", + "sha256": "038d8bffb09c1c60cad4c78142b9fc9f0fe53584ff7000d525dab7aab0189669", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.35.0.netbsd-arm64", - "sha256": "6fc0167ca94eeab2c7bb6b921cf5e3c3925de356d74f72c2582df6f433fa7412", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.netbsd-arm64" + "file": "buildx-v0.36.0.netbsd-arm64", + "sha256": "437424f216eba07710f36a18afab34ffa2118dfa9d0c919c49107975d217792d", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.35.0.openbsd-amd64", - "sha256": "8354dbce0b93256da02dda416825f582ef730a21cd6d55f3e2a54f14039f41fa", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-amd64" + "file": "buildx-v0.36.0.openbsd-amd64", + "sha256": "a3e00092a5b8e4f563a25fa9a2874da36bfaffe9ee0c2032e5423eeefad31bc2", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.35.0.openbsd-arm64", - "sha256": "cdfd44e2072acff1d41796753074c50bb144537a2401d221fc0455ed9a78f76f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.openbsd-arm64" + "file": "buildx-v0.36.0.openbsd-arm64", + "sha256": "42a1f8d766e2aa1309177337b6d0ede1ac3c13e953b962a10b109ed9cd6dba76", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.35.0.linux-ppc64le", - "sha256": "bcee77464deb25cfd0b905d4d871b0aad1b1164d6bcdf8b2fd8b1adb1db021c3", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-ppc64le" + "file": "buildx-v0.36.0.linux-ppc64le", + "sha256": "ebd3c6c77e649c759986380e1281d38b50bd4afe88fec2076ea48c56b1e08227", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.35.0.linux-riscv64", - "sha256": "3ecaf173eb24402ba29e9d3b7ddac4bde259a3a54e98112077014918ab49f61f", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-riscv64" + "file": "buildx-v0.36.0.linux-riscv64", + "sha256": "8b2b242d512e77f711028af53f8501241fceb22a80a8f5e7368a27375cf805a7", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.35.0.linux-s390x", - "sha256": "ef1738f3c70166e968d1bca3f853dbc515a3aa7ffa82f1a2ded033a050cd3203", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.35.0.windows-amd64.exe", - "sha256": "8076395009787cd1d30c94edeb5d7ac3945273374fc162c00e9810c3e9325ebe", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.35.0.windows-arm64.exe", - "sha256": "ae03abd184e69ecefd9b751cdd5862db6d4822c2d27861b5b059fe6c1722681a", - "url": "https://github.com/docker/buildx/releases/download/v0.35.0/buildx-v0.35.0.windows-arm64.exe" + "file": "buildx-v0.36.0.linux-s390x", + "sha256": "7c00dc2644ff428779d075aa080d046397511797d1c8475dce9f3c3471965a04", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-s390x" } }, - "version": "0.35.0" + "version": "0.36.0" }, "compose": { "arches": { From 1be6a77ca8e37a1668250ed412caa56eab811c6d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 30 Jul 2026 15:04:22 -0700 Subject: [PATCH 614/667] Update 29 to 29.7.0 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 00b7d0d00..6d8c19468 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.6.2 +ENV DOCKER_VERSION 29.7.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.6.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.7.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index e47d9b488..8d5305ad6 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.6.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.7.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 86a9557c7..9270928aa 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.6.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.6.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.7.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.6.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.6.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 9b1cd0b12..7089bfc3b 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.6.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.2.zip +ENV DOCKER_VERSION 29.7.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.0.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index e979287ff..03627b44f 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.6.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.6.2.zip +ENV DOCKER_VERSION 29.7.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.0.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/versions.json b/versions.json index ffac3db15..47eb3f717 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.6.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.6.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.7.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.7.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.6.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.7.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.6.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.7.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.6.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.6.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.7.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.6.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.7.0.zip" } }, "buildx": { @@ -157,7 +157,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.6.2" + "version": "29.7.0" }, "29-rc": { "arches": { From 5145971d227a9db2ff09b045fb0817bb529bdc66 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 30 Jul 2026 15:06:11 -0700 Subject: [PATCH 615/667] Update 29-rc --- 29-rc/cli/Dockerfile | 167 ------------ 29-rc/cli/docker-entrypoint.sh | 61 ----- 29-rc/cli/modprobe.sh | 20 -- 29-rc/dind-rootless/Dockerfile | 54 ---- 29-rc/dind/Dockerfile | 108 -------- 29-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 161 +----------- 9 files changed, 1 insertion(+), 990 deletions(-) delete mode 100644 29-rc/cli/Dockerfile delete mode 100755 29-rc/cli/docker-entrypoint.sh delete mode 100755 29-rc/cli/modprobe.sh delete mode 100644 29-rc/dind-rootless/Dockerfile delete mode 100644 29-rc/dind/Dockerfile delete mode 100755 29-rc/dind/dockerd-entrypoint.sh delete mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile deleted file mode 100644 index 49f433447..000000000 --- a/29-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.24 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 29.7.0-rc.1 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.7.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.7.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.7.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.7.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.36.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-amd64'; \ - sha256='07823fdfcd82a41be90155a8b16876c1a780a6462de805a9f3f63b3119ccfb99'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v6'; \ - sha256='6d87680eab65cb2b8c3bba602406a40f718b77eb8e3af10994db794e3deada37'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v7'; \ - sha256='50527239ba76f72e9ffd8227a2e265c6751f71e4908546f0f68c329e87b2c71c'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm64'; \ - sha256='70382de03915c07c488ae4ddc4f7e169ee978f953e754ecfce110ba017e0132b'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-ppc64le'; \ - sha256='ebd3c6c77e649c759986380e1281d38b50bd4afe88fec2076ea48c56b1e08227'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-riscv64'; \ - sha256='8b2b242d512e77f711028af53f8501241fceb22a80a8f5e7368a27375cf805a7'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-s390x'; \ - sha256='7c00dc2644ff428779d075aa080d046397511797d1c8475dce9f3c3471965a04'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 5.3.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-x86_64'; \ - sha256='f9ebc6ebdb19d769b793c245a736caaeb198c62587f13b25c660c13b4987f959'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv6'; \ - sha256='899607529e5e752cbdaec84b73e994378cf8f27f3d626a5a6df56f7511c00304'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv7'; \ - sha256='69276acb37ea70023cf85a8180e869c0cfc8cb5a3e672821400aa58dea56e2e8'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-aarch64'; \ - sha256='aa611e811d0ea25897839c404bfb5bf93ce706dc51c500a4457890f5d0606a86'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-ppc64le'; \ - sha256='3280a0dcc7874c2a564ca1224c5669364bc1a5d83ae7153a9c0182fd76fd2102'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-riscv64'; \ - sha256='e237f165e0fd5472d147db274f0fb5dcdaab4384c36634178307f4c8e965d904'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-s390x'; \ - sha256='3889c8d1677bee347297c8f0a73bc517b5c35da18781812942aef8a87eac9011'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/29-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/29-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile deleted file mode 100644 index c21fda0bb..000000000 --- a/29-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-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 -# slirp4netns is recommended as rootlesskit's net driver -# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.7.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.7.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile deleted file mode 100644 index 2fabcc2fa..000000000 --- a/29-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.7.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.7.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.7.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.7.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 77ff1aab3..000000000 --- a/29-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index dc468a27c..000000000 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.7.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.7.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.36.0 -ENV DOCKER_BUILDX_URL -ENV DOCKER_BUILDX_SHA256 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.3.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index 11f81aa26..000000000 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.7.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.7.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.36.0 -ENV DOCKER_BUILDX_URL -ENV DOCKER_BUILDX_SHA256 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.3.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 47eb3f717..96e8d415e 100644 --- a/versions.json +++ b/versions.json @@ -159,164 +159,5 @@ ], "version": "29.7.0" }, - "29-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.7.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.7.0-rc.1.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.7.0-rc.1.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.7.0-rc.1.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.7.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.7.0-rc.1.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.7.0-rc.1.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.36.0.linux-amd64", - "sha256": "07823fdfcd82a41be90155a8b16876c1a780a6462de805a9f3f63b3119ccfb99", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.36.0.linux-arm-v6", - "sha256": "6d87680eab65cb2b8c3bba602406a40f718b77eb8e3af10994db794e3deada37", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.36.0.linux-arm-v7", - "sha256": "50527239ba76f72e9ffd8227a2e265c6751f71e4908546f0f68c329e87b2c71c", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.36.0.linux-arm64", - "sha256": "70382de03915c07c488ae4ddc4f7e169ee978f953e754ecfce110ba017e0132b", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.36.0.freebsd-amd64", - "sha256": "ec18dd9ba32bfaa0c41bbe43183c8dc26190ec9e6e4219b2f615220eea70da7d", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.36.0.freebsd-arm64", - "sha256": "ff3ea4d5fed7bfae94a8c0810786c60969134bb82b4a757c65aa4310c8446f45", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.36.0.netbsd-amd64", - "sha256": "038d8bffb09c1c60cad4c78142b9fc9f0fe53584ff7000d525dab7aab0189669", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.36.0.netbsd-arm64", - "sha256": "437424f216eba07710f36a18afab34ffa2118dfa9d0c919c49107975d217792d", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.36.0.openbsd-amd64", - "sha256": "a3e00092a5b8e4f563a25fa9a2874da36bfaffe9ee0c2032e5423eeefad31bc2", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.36.0.openbsd-arm64", - "sha256": "42a1f8d766e2aa1309177337b6d0ede1ac3c13e953b962a10b109ed9cd6dba76", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.36.0.linux-ppc64le", - "sha256": "ebd3c6c77e649c759986380e1281d38b50bd4afe88fec2076ea48c56b1e08227", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.36.0.linux-riscv64", - "sha256": "8b2b242d512e77f711028af53f8501241fceb22a80a8f5e7368a27375cf805a7", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.36.0.linux-s390x", - "sha256": "7c00dc2644ff428779d075aa080d046397511797d1c8475dce9f3c3471965a04", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-s390x" - } - }, - "version": "0.36.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "f9ebc6ebdb19d769b793c245a736caaeb198c62587f13b25c660c13b4987f959", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "899607529e5e752cbdaec84b73e994378cf8f27f3d626a5a6df56f7511c00304", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "69276acb37ea70023cf85a8180e869c0cfc8cb5a3e672821400aa58dea56e2e8", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "aa611e811d0ea25897839c404bfb5bf93ce706dc51c500a4457890f5d0606a86", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "56620a2e87e789147b9b1cc5d37eeecec2332e2cdf5c2d58a68f999f2dc416ca", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "32691ba1196d819fa68cbdc0aad9a5569e730a35ae40c6fdd8458110ecd69488", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "3280a0dcc7874c2a564ca1224c5669364bc1a5d83ae7153a9c0182fd76fd2102", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "e237f165e0fd5472d147db274f0fb5dcdaab4384c36634178307f4c8e965d904", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "3889c8d1677bee347297c8f0a73bc517b5c35da18781812942aef8a87eac9011", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "5871699d19ee22904f7d1a7ce7e9e6b5a582f6cf9286afd0117ad601cc6737d6", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-aarch64.exe" - } - }, - "version": "5.3.1" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "29.7.0-rc.1" - } + "29-rc": null } From 6e14e9f3f8ce8717f5fd075c546903edcbd30d75 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Wed, 29 Jul 2026 16:49:47 -0700 Subject: [PATCH 616/667] Add back windows checksums --- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- .../windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 20 +++++++++++++++++++ versions.sh | 9 ++++++++- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 7089bfc3b..98b236aa0 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -41,8 +41,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 ENV DOCKER_BUILDX_VERSION 0.36.0 -ENV DOCKER_BUILDX_URL -ENV DOCKER_BUILDX_SHA256 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ce84699d1d93a67d25888b9e6a717862a71b20305602f96d44770b1c12dfcdd8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 03627b44f..9e1892056 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -41,8 +41,8 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 ENV DOCKER_BUILDX_VERSION 0.36.0 -ENV DOCKER_BUILDX_URL -ENV DOCKER_BUILDX_SHA256 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 ce84699d1d93a67d25888b9e6a717862a71b20305602f96d44770b1c12dfcdd8 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 96e8d415e..83965dd98 100644 --- a/versions.json +++ b/versions.json @@ -41,6 +41,16 @@ "sha256": "70382de03915c07c488ae4ddc4f7e169ee978f953e754ecfce110ba017e0132b", "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm64" }, + "darwin-amd64": { + "file": "buildx-v0.36.0.darwin-amd64", + "sha256": "8a75be22ecf40f633fe0a0199be48fa304c0446a0d7fa8a53d7c71b1d0093028", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.darwin-amd64" + }, + "darwin-arm64v8": { + "file": "buildx-v0.36.0.darwin-arm64", + "sha256": "82c6a3d9df37790c5bdb0d7ca88986d1d17622fc2b88ebe34b275c6c47acd7a6", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.darwin-arm64" + }, "freebsd-amd64": { "file": "buildx-v0.36.0.freebsd-amd64", "sha256": "ec18dd9ba32bfaa0c41bbe43183c8dc26190ec9e6e4219b2f615220eea70da7d", @@ -85,6 +95,16 @@ "file": "buildx-v0.36.0.linux-s390x", "sha256": "7c00dc2644ff428779d075aa080d046397511797d1c8475dce9f3c3471965a04", "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.36.0.windows-amd64.exe", + "sha256": "ce84699d1d93a67d25888b9e6a717862a71b20305602f96d44770b1c12dfcdd8", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.36.0.windows-arm64.exe", + "sha256": "3c553164f2b25dd6d2314d8a9a2c19afac58d48f49095eeb6b46165d93d114d8", + "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-arm64.exe" } }, "version": "0.36.0" diff --git a/versions.sh b/versions.sh index 0803f1e10..fbbc21134 100755 --- a/versions.sh +++ b/versions.sh @@ -63,7 +63,14 @@ buildxVersions="$( buildx= buildxVersion= for buildxVersion in $buildxVersions; do - if checksums="$(_curl "https://github.com/docker/buildx/releases/download/v${buildxVersion}/checksums.txt")"; then + # checksums.txt -> linux + *bsd checksums + # checksums-signed.txt -> windows + darwin checksums (see also https://github.com/docker/buildx/pull/3978) + # fail if one is missing + if \ + checksums="$(_curl "https://github.com/docker/buildx/releases/download/v${buildxVersion}/checksums.txt")" \ + && checksums+=$'\n' \ + && checksums+="$(_curl "https://github.com/docker/buildx/releases/download/v${buildxVersion}/checksums-signed.txt")" \ + ; then buildx="$(jq <<<"$checksums" -csR --arg version "$buildxVersion" ' rtrimstr("\n") | split("\n") | map( From bbeb9261dde64bc735b6edeb4766f8d3d611977d Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 31 Jul 2026 15:04:14 -0700 Subject: [PATCH 617/667] Update 29 to 29.7.1 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 6d8c19468..e7600950a 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.7.0 +ENV DOCKER_VERSION 29.7.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.7.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.7.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 8d5305ad6..57eb9664a 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.7.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.7.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 9270928aa..b3699ad30 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.7.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.7.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 98b236aa0..b56dab996 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.7.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.0.zip +ENV DOCKER_VERSION 29.7.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.1.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 9e1892056..717e33350 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.7.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.0.zip +ENV DOCKER_VERSION 29.7.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.1.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/versions.json b/versions.json index 83965dd98..4c0e1e423 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.7.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.7.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.7.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.7.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.7.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.7.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.7.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.7.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.7.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.7.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.7.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.7.1.zip" } }, "buildx": { @@ -177,7 +177,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.7.0" + "version": "29.7.1" }, "29-rc": null } From 0906c956e96cf64d40b9a8c7a14e5b407602c853 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 3 Aug 2026 09:04:13 -0700 Subject: [PATCH 618/667] Update 29 to compose 5.4.0 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index e7600950a..6702c63d7 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.3.1 +ENV DOCKER_COMPOSE_VERSION 5.4.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-x86_64'; \ - sha256='f9ebc6ebdb19d769b793c245a736caaeb198c62587f13b25c660c13b4987f959'; \ + url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-x86_64'; \ + sha256='837fd1d35bf6a494f41b5b5988269a7be79de337cf1a1a6ff0e45ab51bb4e9be'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv6'; \ - sha256='899607529e5e752cbdaec84b73e994378cf8f27f3d626a5a6df56f7511c00304'; \ + url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-armv6'; \ + sha256='a5832fe8544e6e72af7cc380a2e3c014a6ced6d56db12fe814d40ffd0e657a6d'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv7'; \ - sha256='69276acb37ea70023cf85a8180e869c0cfc8cb5a3e672821400aa58dea56e2e8'; \ + url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-armv7'; \ + sha256='f0c92550db24083a2622e4e980a3fdc13890125962ca09590a86c87ad0b3c536'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-aarch64'; \ - sha256='aa611e811d0ea25897839c404bfb5bf93ce706dc51c500a4457890f5d0606a86'; \ + url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-aarch64'; \ + sha256='fc5d1371f1ec7987e703da94ede49af3fbfb240b83f22991a98511de7bc4b93b'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-ppc64le'; \ - sha256='3280a0dcc7874c2a564ca1224c5669364bc1a5d83ae7153a9c0182fd76fd2102'; \ + url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-ppc64le'; \ + sha256='8158968c7ddb298ae901024c5fb6d471454d1bd75bdea317c4a9d24f87fa4868'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-riscv64'; \ - sha256='e237f165e0fd5472d147db274f0fb5dcdaab4384c36634178307f4c8e965d904'; \ + url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-riscv64'; \ + sha256='016b7ac25ce605575bab99464d6b63141c41e14cc49cd0fa19c82aa8dd75a004'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-s390x'; \ - sha256='3889c8d1677bee347297c8f0a73bc517b5c35da18781812942aef8a87eac9011'; \ + url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-s390x'; \ + sha256='892b60ad432d526b80376ba0b15429c6849ccc598b50b657aa6339310110a85a'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index b56dab996..356905936 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.3.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9 +ENV DOCKER_COMPOSE_VERSION 5.4.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d51bc731b3ff6f062a26e8fdfd391ae98aeab516432f097c66d39c1c9d06680e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 717e33350..838f48a61 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.3.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9 +ENV DOCKER_COMPOSE_VERSION 5.4.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 d51bc731b3ff6f062a26e8fdfd391ae98aeab516432f097c66d39c1c9d06680e RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 4c0e1e423..31e60ebc3 100644 --- a/versions.json +++ b/versions.json @@ -113,61 +113,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "f9ebc6ebdb19d769b793c245a736caaeb198c62587f13b25c660c13b4987f959", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-x86_64" + "sha256": "837fd1d35bf6a494f41b5b5988269a7be79de337cf1a1a6ff0e45ab51bb4e9be", + "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "899607529e5e752cbdaec84b73e994378cf8f27f3d626a5a6df56f7511c00304", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv6" + "sha256": "a5832fe8544e6e72af7cc380a2e3c014a6ced6d56db12fe814d40ffd0e657a6d", + "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "69276acb37ea70023cf85a8180e869c0cfc8cb5a3e672821400aa58dea56e2e8", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv7" + "sha256": "f0c92550db24083a2622e4e980a3fdc13890125962ca09590a86c87ad0b3c536", + "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "aa611e811d0ea25897839c404bfb5bf93ce706dc51c500a4457890f5d0606a86", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-aarch64" + "sha256": "fc5d1371f1ec7987e703da94ede49af3fbfb240b83f22991a98511de7bc4b93b", + "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "56620a2e87e789147b9b1cc5d37eeecec2332e2cdf5c2d58a68f999f2dc416ca", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-darwin-x86_64" + "sha256": "59fc378c6832c7c8d628d4d38a4e2bebcad579b21d1d380e9b8872961fe3da83", + "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "32691ba1196d819fa68cbdc0aad9a5569e730a35ae40c6fdd8458110ecd69488", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-darwin-aarch64" + "sha256": "bc3d1fd4c01e3af9b481fc5ea153ea7c006c77eb39be78e9af3e2e8ebecc0d61", + "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "3280a0dcc7874c2a564ca1224c5669364bc1a5d83ae7153a9c0182fd76fd2102", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-ppc64le" + "sha256": "8158968c7ddb298ae901024c5fb6d471454d1bd75bdea317c4a9d24f87fa4868", + "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e237f165e0fd5472d147db274f0fb5dcdaab4384c36634178307f4c8e965d904", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-riscv64" + "sha256": "016b7ac25ce605575bab99464d6b63141c41e14cc49cd0fa19c82aa8dd75a004", + "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "3889c8d1677bee347297c8f0a73bc517b5c35da18781812942aef8a87eac9011", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-s390x" + "sha256": "892b60ad432d526b80376ba0b15429c6849ccc598b50b657aa6339310110a85a", + "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe" + "sha256": "d51bc731b3ff6f062a26e8fdfd391ae98aeab516432f097c66d39c1c9d06680e", + "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "5871699d19ee22904f7d1a7ce7e9e6b5a582f6cf9286afd0117ad601cc6737d6", - "url": "https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-aarch64.exe" + "sha256": "7895808619a27dd6cbca51b61ac211b59711ed82660b867b2c852d34e7881662", + "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-windows-aarch64.exe" } }, - "version": "5.3.1" + "version": "5.4.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 75cad4ca2d789f48787f3c109c80aab966156006 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 4 Aug 2026 09:04:14 -0700 Subject: [PATCH 619/667] Update 29 to buildx 0.36.1 --- 29/cli/Dockerfile | 30 ++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 104 +++++++++--------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 6702c63d7..876e2f3e5 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.36.0 +ENV DOCKER_BUILDX_VERSION 0.36.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-amd64'; \ - sha256='07823fdfcd82a41be90155a8b16876c1a780a6462de805a9f3f63b3119ccfb99'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-amd64'; \ + sha256='48af8a397ebd60178778bf63611dbcebe5f5e7a9be90eb9147b24b9587455778'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v6'; \ - sha256='6d87680eab65cb2b8c3bba602406a40f718b77eb8e3af10994db794e3deada37'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v6'; \ + sha256='324ed0ca85defb28442eda3b002472dbfc7e77bf6992292f2daa94f699f0e43a'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v7'; \ - sha256='50527239ba76f72e9ffd8227a2e265c6751f71e4908546f0f68c329e87b2c71c'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v7'; \ + sha256='32ff9bee8c48c1fbceb1e2fb1d8472ec817ad1e25b5dff58ec9abf9b8d903518'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm64'; \ - sha256='70382de03915c07c488ae4ddc4f7e169ee978f953e754ecfce110ba017e0132b'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm64'; \ + sha256='5d0cafd9d16afe1a0f0d9529885344ace2cc99efdd531b6c783c5455a6001569'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-ppc64le'; \ - sha256='ebd3c6c77e649c759986380e1281d38b50bd4afe88fec2076ea48c56b1e08227'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-ppc64le'; \ + sha256='46f71a277d1d05cb20f87601abfb729d0056f88705903bd82ad6153f80e3cd9b'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-riscv64'; \ - sha256='8b2b242d512e77f711028af53f8501241fceb22a80a8f5e7368a27375cf805a7'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-riscv64'; \ + sha256='5e82f0ada635dabda74f1486dea604e0ea3a1214971ec8c52dcb4db6e08cce26'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-s390x'; \ - sha256='7c00dc2644ff428779d075aa080d046397511797d1c8475dce9f3c3471965a04'; \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-s390x'; \ + sha256='9d8dff974aa0166fc59a5804f35bb6c9ea0693a3f5061a81101668cfe707b0b4'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 356905936..08cd15d5e 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.36.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ce84699d1d93a67d25888b9e6a717862a71b20305602f96d44770b1c12dfcdd8 +ENV DOCKER_BUILDX_VERSION 0.36.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 838f48a61..b11d8e005 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.36.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 ce84699d1d93a67d25888b9e6a717862a71b20305602f96d44770b1c12dfcdd8 +ENV DOCKER_BUILDX_VERSION 0.36.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 31e60ebc3..d16466f81 100644 --- a/versions.json +++ b/versions.json @@ -22,92 +22,92 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.36.0.linux-amd64", - "sha256": "07823fdfcd82a41be90155a8b16876c1a780a6462de805a9f3f63b3119ccfb99", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-amd64" + "file": "buildx-v0.36.1.linux-amd64", + "sha256": "48af8a397ebd60178778bf63611dbcebe5f5e7a9be90eb9147b24b9587455778", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.36.0.linux-arm-v6", - "sha256": "6d87680eab65cb2b8c3bba602406a40f718b77eb8e3af10994db794e3deada37", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v6" + "file": "buildx-v0.36.1.linux-arm-v6", + "sha256": "324ed0ca85defb28442eda3b002472dbfc7e77bf6992292f2daa94f699f0e43a", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.36.0.linux-arm-v7", - "sha256": "50527239ba76f72e9ffd8227a2e265c6751f71e4908546f0f68c329e87b2c71c", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm-v7" + "file": "buildx-v0.36.1.linux-arm-v7", + "sha256": "32ff9bee8c48c1fbceb1e2fb1d8472ec817ad1e25b5dff58ec9abf9b8d903518", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.36.0.linux-arm64", - "sha256": "70382de03915c07c488ae4ddc4f7e169ee978f953e754ecfce110ba017e0132b", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-arm64" + "file": "buildx-v0.36.1.linux-arm64", + "sha256": "5d0cafd9d16afe1a0f0d9529885344ace2cc99efdd531b6c783c5455a6001569", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.36.0.darwin-amd64", - "sha256": "8a75be22ecf40f633fe0a0199be48fa304c0446a0d7fa8a53d7c71b1d0093028", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.darwin-amd64" + "file": "buildx-v0.36.1.darwin-amd64", + "sha256": "52a39ee4012d18f83373656712102ebda55656121dcdabbbb1ccfbd41b7debe8", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.36.0.darwin-arm64", - "sha256": "82c6a3d9df37790c5bdb0d7ca88986d1d17622fc2b88ebe34b275c6c47acd7a6", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.darwin-arm64" + "file": "buildx-v0.36.1.darwin-arm64", + "sha256": "214cdc36788602862dbc82b523d58648b4585c7b0ff95218b0817c44db5573d7", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.36.0.freebsd-amd64", - "sha256": "ec18dd9ba32bfaa0c41bbe43183c8dc26190ec9e6e4219b2f615220eea70da7d", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.freebsd-amd64" + "file": "buildx-v0.36.1.freebsd-amd64", + "sha256": "43d8ce4bbbf981639db2ca441ab6d6c59cc015ae47e3882d2eb9f7cc035c4948", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.36.0.freebsd-arm64", - "sha256": "ff3ea4d5fed7bfae94a8c0810786c60969134bb82b4a757c65aa4310c8446f45", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.freebsd-arm64" + "file": "buildx-v0.36.1.freebsd-arm64", + "sha256": "8a9db4e9c1f6b900772759a0cb8078ec495cd3a1870e27b79fcbf7d527841178", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.36.0.netbsd-amd64", - "sha256": "038d8bffb09c1c60cad4c78142b9fc9f0fe53584ff7000d525dab7aab0189669", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.netbsd-amd64" + "file": "buildx-v0.36.1.netbsd-amd64", + "sha256": "9a71cbbec0fa124c68009c186299403108d49e278389b81f118f44b539285d56", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.36.0.netbsd-arm64", - "sha256": "437424f216eba07710f36a18afab34ffa2118dfa9d0c919c49107975d217792d", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.netbsd-arm64" + "file": "buildx-v0.36.1.netbsd-arm64", + "sha256": "e198b77ff748684ee984060679beaee419e3c4bbf7fe58340dcad9bc3dbd1335", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.36.0.openbsd-amd64", - "sha256": "a3e00092a5b8e4f563a25fa9a2874da36bfaffe9ee0c2032e5423eeefad31bc2", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.openbsd-amd64" + "file": "buildx-v0.36.1.openbsd-amd64", + "sha256": "a1cb418e79ad7fa5c001d225d758d89acb94d931e5f612eebbcf34b9cf06141a", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.36.0.openbsd-arm64", - "sha256": "42a1f8d766e2aa1309177337b6d0ede1ac3c13e953b962a10b109ed9cd6dba76", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.openbsd-arm64" + "file": "buildx-v0.36.1.openbsd-arm64", + "sha256": "6623871b27b50cf68dfeb2ea4c5fd918f7e867cc5eeb39474dbcc73a4321d9b9", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.36.0.linux-ppc64le", - "sha256": "ebd3c6c77e649c759986380e1281d38b50bd4afe88fec2076ea48c56b1e08227", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-ppc64le" + "file": "buildx-v0.36.1.linux-ppc64le", + "sha256": "46f71a277d1d05cb20f87601abfb729d0056f88705903bd82ad6153f80e3cd9b", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.36.0.linux-riscv64", - "sha256": "8b2b242d512e77f711028af53f8501241fceb22a80a8f5e7368a27375cf805a7", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-riscv64" + "file": "buildx-v0.36.1.linux-riscv64", + "sha256": "5e82f0ada635dabda74f1486dea604e0ea3a1214971ec8c52dcb4db6e08cce26", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.36.0.linux-s390x", - "sha256": "7c00dc2644ff428779d075aa080d046397511797d1c8475dce9f3c3471965a04", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.linux-s390x" + "file": "buildx-v0.36.1.linux-s390x", + "sha256": "9d8dff974aa0166fc59a5804f35bb6c9ea0693a3f5061a81101668cfe707b0b4", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.36.0.windows-amd64.exe", - "sha256": "ce84699d1d93a67d25888b9e6a717862a71b20305602f96d44770b1c12dfcdd8", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-amd64.exe" + "file": "buildx-v0.36.1.windows-amd64.exe", + "sha256": "cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.36.0.windows-arm64.exe", - "sha256": "3c553164f2b25dd6d2314d8a9a2c19afac58d48f49095eeb6b46165d93d114d8", - "url": "https://github.com/docker/buildx/releases/download/v0.36.0/buildx-v0.36.0.windows-arm64.exe" + "file": "buildx-v0.36.1.windows-arm64.exe", + "sha256": "79522ff962bf3b127c8e9ca56944b1a3fcbe46e1d0b4144d481f356d8c13fa74", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-arm64.exe" } }, - "version": "0.36.0" + "version": "0.36.1" }, "compose": { "arches": { From 3289af88086d67e6f0bfebfa0617541a0f574d96 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 6 Aug 2026 09:04:14 -0700 Subject: [PATCH 620/667] Update 29 to 29.7.2 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 876e2f3e5..1421d6003 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.7.1 +ENV DOCKER_VERSION 29.7.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.7.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.7.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 57eb9664a..cfbb3910f 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.7.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.7.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index b3699ad30..7ca002e9e 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.7.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.7.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 08cd15d5e..82b2da0c7 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.7.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.1.zip +ENV DOCKER_VERSION 29.7.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.2.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index b11d8e005..ccc773056 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.7.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.1.zip +ENV DOCKER_VERSION 29.7.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.2.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/versions.json b/versions.json index d16466f81..e77b436c0 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.7.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.7.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.7.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.7.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.7.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.7.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.7.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.7.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.7.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.7.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.7.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.7.2.zip" } }, "buildx": { @@ -177,7 +177,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.7.1" + "version": "29.7.2" }, "29-rc": null } From 03799d583749c1ccce1bedbb3df49892bd66b1c1 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 18 Aug 2026 14:21:20 -0700 Subject: [PATCH 621/667] Deal with GitHub API change They've added a `commitsRefRoute` indirection to this API now. See also https://github.com/docker-library/golang/pull/586 --- versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.sh b/versions.sh index fbbc21134..7693592cb 100755 --- a/versions.sh +++ b/versions.sh @@ -40,7 +40,7 @@ _curl() { dindLatest="$( _curl -H 'Accept: application/json' 'https://github.com/docker/docker/commits/master/hack/dind.atom' \ - | jq -r '.payload | first(.commitGroups[].commits[].oid)' + | jq -r '.payload | first(.. | .commits?[]?.oid)' )" dockerVersions="$( From db0f82988f46f151062aad06c25bb0d79a6572ef Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 18 Aug 2026 15:04:13 -0700 Subject: [PATCH 622/667] Update 29 to compose 5.5.0 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 1421d6003..85a08ae9d 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.4.0 +ENV DOCKER_COMPOSE_VERSION 5.5.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-x86_64'; \ - sha256='837fd1d35bf6a494f41b5b5988269a7be79de337cf1a1a6ff0e45ab51bb4e9be'; \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-x86_64'; \ + sha256='c57ab918abd5b05ca7e7d0f275875dd1330a695074f309dc9eab1b49efafcd4b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-armv6'; \ - sha256='a5832fe8544e6e72af7cc380a2e3c014a6ced6d56db12fe814d40ffd0e657a6d'; \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv6'; \ + sha256='fad8dc4c8ab0a80395ccb3dbd3d7da46c85024818dcc7b90305ad6971de61f43'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-armv7'; \ - sha256='f0c92550db24083a2622e4e980a3fdc13890125962ca09590a86c87ad0b3c536'; \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv7'; \ + sha256='50a7c5bc659f0d619f71f5600b1f15981b99f86df6167d600e0445ef179d5a06'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-aarch64'; \ - sha256='fc5d1371f1ec7987e703da94ede49af3fbfb240b83f22991a98511de7bc4b93b'; \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-aarch64'; \ + sha256='ff42489f5a9b879d5d117c5ffea6defc27390b3286da8ad52cbc9c6ab5df590e'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-ppc64le'; \ - sha256='8158968c7ddb298ae901024c5fb6d471454d1bd75bdea317c4a9d24f87fa4868'; \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-ppc64le'; \ + sha256='75fc29e87b04b7573c8deb7cf98ea4c2ab58b6c73f74a1d467ecc40485725be9'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-riscv64'; \ - sha256='016b7ac25ce605575bab99464d6b63141c41e14cc49cd0fa19c82aa8dd75a004'; \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-riscv64'; \ + sha256='d782b976282d629b6100477ddd4ed2e0439b0892e3d05d36bc4fc82fa1d6de5b'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-s390x'; \ - sha256='892b60ad432d526b80376ba0b15429c6849ccc598b50b657aa6339310110a85a'; \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-s390x'; \ + sha256='abf5f4044cec07af2dcf08e90629e95cb8efd61c877f60f02d7c11308cce105d'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 82b2da0c7..62817b2fe 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.4.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d51bc731b3ff6f062a26e8fdfd391ae98aeab516432f097c66d39c1c9d06680e +ENV DOCKER_COMPOSE_VERSION 5.5.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index ccc773056..d97cf3517 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.4.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 d51bc731b3ff6f062a26e8fdfd391ae98aeab516432f097c66d39c1c9d06680e +ENV DOCKER_COMPOSE_VERSION 5.5.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index e77b436c0..e44388d39 100644 --- a/versions.json +++ b/versions.json @@ -113,61 +113,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "837fd1d35bf6a494f41b5b5988269a7be79de337cf1a1a6ff0e45ab51bb4e9be", - "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-x86_64" + "sha256": "c57ab918abd5b05ca7e7d0f275875dd1330a695074f309dc9eab1b49efafcd4b", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "a5832fe8544e6e72af7cc380a2e3c014a6ced6d56db12fe814d40ffd0e657a6d", - "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-armv6" + "sha256": "fad8dc4c8ab0a80395ccb3dbd3d7da46c85024818dcc7b90305ad6971de61f43", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "f0c92550db24083a2622e4e980a3fdc13890125962ca09590a86c87ad0b3c536", - "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-armv7" + "sha256": "50a7c5bc659f0d619f71f5600b1f15981b99f86df6167d600e0445ef179d5a06", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "fc5d1371f1ec7987e703da94ede49af3fbfb240b83f22991a98511de7bc4b93b", - "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-aarch64" + "sha256": "ff42489f5a9b879d5d117c5ffea6defc27390b3286da8ad52cbc9c6ab5df590e", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "59fc378c6832c7c8d628d4d38a4e2bebcad579b21d1d380e9b8872961fe3da83", - "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-darwin-x86_64" + "sha256": "d0f0c867fd740953899a63d6d1a291dc60200b0961de9612a01bcc560e6e29a6", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "bc3d1fd4c01e3af9b481fc5ea153ea7c006c77eb39be78e9af3e2e8ebecc0d61", - "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-darwin-aarch64" + "sha256": "6777710e5a5db5709e5f4b5985844e74b73cc1a6123e3a6690b6ababf2deaf51", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "8158968c7ddb298ae901024c5fb6d471454d1bd75bdea317c4a9d24f87fa4868", - "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-ppc64le" + "sha256": "75fc29e87b04b7573c8deb7cf98ea4c2ab58b6c73f74a1d467ecc40485725be9", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "016b7ac25ce605575bab99464d6b63141c41e14cc49cd0fa19c82aa8dd75a004", - "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-riscv64" + "sha256": "d782b976282d629b6100477ddd4ed2e0439b0892e3d05d36bc4fc82fa1d6de5b", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "892b60ad432d526b80376ba0b15429c6849ccc598b50b657aa6339310110a85a", - "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-s390x" + "sha256": "abf5f4044cec07af2dcf08e90629e95cb8efd61c877f60f02d7c11308cce105d", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "d51bc731b3ff6f062a26e8fdfd391ae98aeab516432f097c66d39c1c9d06680e", - "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-windows-x86_64.exe" + "sha256": "51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "7895808619a27dd6cbca51b61ac211b59711ed82660b867b2c852d34e7881662", - "url": "https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-windows-aarch64.exe" + "sha256": "673b844868a8ebae57b81f3cfeffca8a00ed256e660a357c057191a40ffc83c2", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-aarch64.exe" } }, - "version": "5.4.0" + "version": "5.5.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From e6662c4584b44bb7fc0b6737d8efa76305a525e0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 28 Aug 2026 15:04:24 -0700 Subject: [PATCH 623/667] Update 29-rc to 29.8.0-rc.1, buildx 0.36.1, compose 5.5.0 --- 29-rc/cli/Dockerfile | 167 ++++++++++++ 29-rc/cli/docker-entrypoint.sh | 61 +++++ 29-rc/cli/modprobe.sh | 20 ++ 29-rc/dind-rootless/Dockerfile | 54 ++++ 29-rc/dind/Dockerfile | 108 ++++++++ 29-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 181 ++++++++++++- 9 files changed, 1010 insertions(+), 1 deletion(-) create mode 100644 29-rc/cli/Dockerfile create mode 100755 29-rc/cli/docker-entrypoint.sh create mode 100755 29-rc/cli/modprobe.sh create mode 100644 29-rc/dind-rootless/Dockerfile create mode 100644 29-rc/dind/Dockerfile create mode 100755 29-rc/dind/dockerd-entrypoint.sh create mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile new file mode 100644 index 000000000..29d378976 --- /dev/null +++ b/29-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.24 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 29.8.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.8.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.8.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.8.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.8.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.36.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-amd64'; \ + sha256='48af8a397ebd60178778bf63611dbcebe5f5e7a9be90eb9147b24b9587455778'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v6'; \ + sha256='324ed0ca85defb28442eda3b002472dbfc7e77bf6992292f2daa94f699f0e43a'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v7'; \ + sha256='32ff9bee8c48c1fbceb1e2fb1d8472ec817ad1e25b5dff58ec9abf9b8d903518'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm64'; \ + sha256='5d0cafd9d16afe1a0f0d9529885344ace2cc99efdd531b6c783c5455a6001569'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-ppc64le'; \ + sha256='46f71a277d1d05cb20f87601abfb729d0056f88705903bd82ad6153f80e3cd9b'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-riscv64'; \ + sha256='5e82f0ada635dabda74f1486dea604e0ea3a1214971ec8c52dcb4db6e08cce26'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-s390x'; \ + sha256='9d8dff974aa0166fc59a5804f35bb6c9ea0693a3f5061a81101668cfe707b0b4'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 5.5.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-x86_64'; \ + sha256='c57ab918abd5b05ca7e7d0f275875dd1330a695074f309dc9eab1b49efafcd4b'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv6'; \ + sha256='fad8dc4c8ab0a80395ccb3dbd3d7da46c85024818dcc7b90305ad6971de61f43'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv7'; \ + sha256='50a7c5bc659f0d619f71f5600b1f15981b99f86df6167d600e0445ef179d5a06'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-aarch64'; \ + sha256='ff42489f5a9b879d5d117c5ffea6defc27390b3286da8ad52cbc9c6ab5df590e'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-ppc64le'; \ + sha256='75fc29e87b04b7573c8deb7cf98ea4c2ab58b6c73f74a1d467ecc40485725be9'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-riscv64'; \ + sha256='d782b976282d629b6100477ddd4ed2e0439b0892e3d05d36bc4fc82fa1d6de5b'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-s390x'; \ + sha256='abf5f4044cec07af2dcf08e90629e95cb8efd61c877f60f02d7c11308cce105d'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/29-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/29-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..70c5da341 --- /dev/null +++ b/29-rc/dind-rootless/Dockerfile @@ -0,0 +1,54 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-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 +# slirp4netns is recommended as rootlesskit's net driver +# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.8.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.8.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile new file mode 100644 index 000000000..808086af1 --- /dev/null +++ b/29-rc/dind/Dockerfile @@ -0,0 +1,108 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-rc-cli + +# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +RUN set -eux; \ + apk add --no-cache \ + btrfs-progs \ + e2fsprogs \ + e2fsprogs-extra \ + git \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xfsprogs \ + xz \ + zfs \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.8.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.8.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.8.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.8.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + containerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..77ff1aab3 --- /dev/null +++ b/29-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..72beb6208 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.8.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.8.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.36.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.5.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..d2242332b --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.8.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.8.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.36.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.5.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index e44388d39..917616715 100644 --- a/versions.json +++ b/versions.json @@ -179,5 +179,184 @@ ], "version": "29.7.2" }, - "29-rc": null + "29-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.8.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.8.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.8.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.8.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.8.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.8.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.8.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.36.1.linux-amd64", + "sha256": "48af8a397ebd60178778bf63611dbcebe5f5e7a9be90eb9147b24b9587455778", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.36.1.linux-arm-v6", + "sha256": "324ed0ca85defb28442eda3b002472dbfc7e77bf6992292f2daa94f699f0e43a", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.36.1.linux-arm-v7", + "sha256": "32ff9bee8c48c1fbceb1e2fb1d8472ec817ad1e25b5dff58ec9abf9b8d903518", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.36.1.linux-arm64", + "sha256": "5d0cafd9d16afe1a0f0d9529885344ace2cc99efdd531b6c783c5455a6001569", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm64" + }, + "darwin-amd64": { + "file": "buildx-v0.36.1.darwin-amd64", + "sha256": "52a39ee4012d18f83373656712102ebda55656121dcdabbbb1ccfbd41b7debe8", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.darwin-amd64" + }, + "darwin-arm64v8": { + "file": "buildx-v0.36.1.darwin-arm64", + "sha256": "214cdc36788602862dbc82b523d58648b4585c7b0ff95218b0817c44db5573d7", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.darwin-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.36.1.freebsd-amd64", + "sha256": "43d8ce4bbbf981639db2ca441ab6d6c59cc015ae47e3882d2eb9f7cc035c4948", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.36.1.freebsd-arm64", + "sha256": "8a9db4e9c1f6b900772759a0cb8078ec495cd3a1870e27b79fcbf7d527841178", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.36.1.netbsd-amd64", + "sha256": "9a71cbbec0fa124c68009c186299403108d49e278389b81f118f44b539285d56", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.36.1.netbsd-arm64", + "sha256": "e198b77ff748684ee984060679beaee419e3c4bbf7fe58340dcad9bc3dbd1335", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.36.1.openbsd-amd64", + "sha256": "a1cb418e79ad7fa5c001d225d758d89acb94d931e5f612eebbcf34b9cf06141a", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.36.1.openbsd-arm64", + "sha256": "6623871b27b50cf68dfeb2ea4c5fd918f7e867cc5eeb39474dbcc73a4321d9b9", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.36.1.linux-ppc64le", + "sha256": "46f71a277d1d05cb20f87601abfb729d0056f88705903bd82ad6153f80e3cd9b", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.36.1.linux-riscv64", + "sha256": "5e82f0ada635dabda74f1486dea604e0ea3a1214971ec8c52dcb4db6e08cce26", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.36.1.linux-s390x", + "sha256": "9d8dff974aa0166fc59a5804f35bb6c9ea0693a3f5061a81101668cfe707b0b4", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.36.1.windows-amd64.exe", + "sha256": "cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.36.1.windows-arm64.exe", + "sha256": "79522ff962bf3b127c8e9ca56944b1a3fcbe46e1d0b4144d481f356d8c13fa74", + "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-arm64.exe" + } + }, + "version": "0.36.1" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "c57ab918abd5b05ca7e7d0f275875dd1330a695074f309dc9eab1b49efafcd4b", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "fad8dc4c8ab0a80395ccb3dbd3d7da46c85024818dcc7b90305ad6971de61f43", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "50a7c5bc659f0d619f71f5600b1f15981b99f86df6167d600e0445ef179d5a06", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "ff42489f5a9b879d5d117c5ffea6defc27390b3286da8ad52cbc9c6ab5df590e", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "d0f0c867fd740953899a63d6d1a291dc60200b0961de9612a01bcc560e6e29a6", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "6777710e5a5db5709e5f4b5985844e74b73cc1a6123e3a6690b6ababf2deaf51", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "75fc29e87b04b7573c8deb7cf98ea4c2ab58b6c73f74a1d467ecc40485725be9", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "d782b976282d629b6100477ddd4ed2e0439b0892e3d05d36bc4fc82fa1d6de5b", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "abf5f4044cec07af2dcf08e90629e95cb8efd61c877f60f02d7c11308cce105d", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "673b844868a8ebae57b81f3cfeffca8a00ed256e660a357c057191a40ffc83c2", + "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-aarch64.exe" + } + }, + "version": "5.5.0" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "29.8.0-rc.1" + } } From de6455336d953b82294400f061289b9cf0c124ff Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 2 Sep 2026 15:04:15 -0700 Subject: [PATCH 624/667] Update 29 to buildx 0.37.0 --- 29/cli/Dockerfile | 30 ++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 104 +++++++++--------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 85a08ae9d..4df964a6f 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.36.1 +ENV DOCKER_BUILDX_VERSION 0.37.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-amd64'; \ - sha256='48af8a397ebd60178778bf63611dbcebe5f5e7a9be90eb9147b24b9587455778'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-amd64'; \ + sha256='ae43fa08c796b44efc86d7a63c55f73f7c35f3101188dea7bf93bcd6f99577ba'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v6'; \ - sha256='324ed0ca85defb28442eda3b002472dbfc7e77bf6992292f2daa94f699f0e43a'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v6'; \ + sha256='56229f2d8459f902ca4cad09e2a931e149ea7e10d8728fe4f0f315d66b76fe2c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v7'; \ - sha256='32ff9bee8c48c1fbceb1e2fb1d8472ec817ad1e25b5dff58ec9abf9b8d903518'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v7'; \ + sha256='9171f1aff0d6f48afd2248b493accc98d4c8d632e40698ad9444f872991acb13'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm64'; \ - sha256='5d0cafd9d16afe1a0f0d9529885344ace2cc99efdd531b6c783c5455a6001569'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm64'; \ + sha256='d263ce31bd2c9e9210aaa2c7537c67802bccabcd342e4c9fe4907085ddb41aa5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-ppc64le'; \ - sha256='46f71a277d1d05cb20f87601abfb729d0056f88705903bd82ad6153f80e3cd9b'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-ppc64le'; \ + sha256='ed99c4401ece2c6940d99c24b719332af9dfbbe8aba308c59676183a6285f376'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-riscv64'; \ - sha256='5e82f0ada635dabda74f1486dea604e0ea3a1214971ec8c52dcb4db6e08cce26'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-riscv64'; \ + sha256='8de7783c3dae7b14b361a20d35b15d9368a31a85791da53e4e96e146c7ab120a'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-s390x'; \ - sha256='9d8dff974aa0166fc59a5804f35bb6c9ea0693a3f5061a81101668cfe707b0b4'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-s390x'; \ + sha256='5209e6d229cbaee67ee9a070abf2de96304ffcc2104edcf1475a0d5458f94a50'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 62817b2fe..3fdd75579 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.36.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330 +ENV DOCKER_BUILDX_VERSION 0.37.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index d97cf3517..ba9cf3253 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.36.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330 +ENV DOCKER_BUILDX_VERSION 0.37.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 917616715..f31f11920 100644 --- a/versions.json +++ b/versions.json @@ -22,92 +22,92 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.36.1.linux-amd64", - "sha256": "48af8a397ebd60178778bf63611dbcebe5f5e7a9be90eb9147b24b9587455778", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-amd64" + "file": "buildx-v0.37.0.linux-amd64", + "sha256": "ae43fa08c796b44efc86d7a63c55f73f7c35f3101188dea7bf93bcd6f99577ba", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.36.1.linux-arm-v6", - "sha256": "324ed0ca85defb28442eda3b002472dbfc7e77bf6992292f2daa94f699f0e43a", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v6" + "file": "buildx-v0.37.0.linux-arm-v6", + "sha256": "56229f2d8459f902ca4cad09e2a931e149ea7e10d8728fe4f0f315d66b76fe2c", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.36.1.linux-arm-v7", - "sha256": "32ff9bee8c48c1fbceb1e2fb1d8472ec817ad1e25b5dff58ec9abf9b8d903518", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v7" + "file": "buildx-v0.37.0.linux-arm-v7", + "sha256": "9171f1aff0d6f48afd2248b493accc98d4c8d632e40698ad9444f872991acb13", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.36.1.linux-arm64", - "sha256": "5d0cafd9d16afe1a0f0d9529885344ace2cc99efdd531b6c783c5455a6001569", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm64" + "file": "buildx-v0.37.0.linux-arm64", + "sha256": "d263ce31bd2c9e9210aaa2c7537c67802bccabcd342e4c9fe4907085ddb41aa5", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.36.1.darwin-amd64", - "sha256": "52a39ee4012d18f83373656712102ebda55656121dcdabbbb1ccfbd41b7debe8", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.darwin-amd64" + "file": "buildx-v0.37.0.darwin-amd64", + "sha256": "9d5a359608ffddbc9049eb0a8128db798a1fcc30cbfb2e451cb49ab99cbe0635", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.36.1.darwin-arm64", - "sha256": "214cdc36788602862dbc82b523d58648b4585c7b0ff95218b0817c44db5573d7", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.darwin-arm64" + "file": "buildx-v0.37.0.darwin-arm64", + "sha256": "4cf78bb790f96f576522af0db716c7c25e8937a71c3303a165ff90d5105170ff", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.36.1.freebsd-amd64", - "sha256": "43d8ce4bbbf981639db2ca441ab6d6c59cc015ae47e3882d2eb9f7cc035c4948", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.freebsd-amd64" + "file": "buildx-v0.37.0.freebsd-amd64", + "sha256": "17e7e624fcf8232fab6ee64258066f9b63967dba07d37ff6a7ae7f28d8f71174", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.36.1.freebsd-arm64", - "sha256": "8a9db4e9c1f6b900772759a0cb8078ec495cd3a1870e27b79fcbf7d527841178", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.freebsd-arm64" + "file": "buildx-v0.37.0.freebsd-arm64", + "sha256": "1a04292574a37b03906a139ae0c4432982aa3ba0d09ffa5dff88825f3d046901", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.36.1.netbsd-amd64", - "sha256": "9a71cbbec0fa124c68009c186299403108d49e278389b81f118f44b539285d56", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.netbsd-amd64" + "file": "buildx-v0.37.0.netbsd-amd64", + "sha256": "503693f34585e8d3a089d45bbbe1e5e7dc34d82d0c92a566b33e28ffe02cf458", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.36.1.netbsd-arm64", - "sha256": "e198b77ff748684ee984060679beaee419e3c4bbf7fe58340dcad9bc3dbd1335", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.netbsd-arm64" + "file": "buildx-v0.37.0.netbsd-arm64", + "sha256": "839bbf539b6852d82c49400ea208a46d82f6b4827ecd7b5243f3d3860e27218e", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.36.1.openbsd-amd64", - "sha256": "a1cb418e79ad7fa5c001d225d758d89acb94d931e5f612eebbcf34b9cf06141a", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.openbsd-amd64" + "file": "buildx-v0.37.0.openbsd-amd64", + "sha256": "15103c200a579b65b4d1dead390739685f9fa0f19fc9b05db5b9230918e5f234", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.36.1.openbsd-arm64", - "sha256": "6623871b27b50cf68dfeb2ea4c5fd918f7e867cc5eeb39474dbcc73a4321d9b9", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.openbsd-arm64" + "file": "buildx-v0.37.0.openbsd-arm64", + "sha256": "4cff41a3430f0f8173fd3975c648968e97da3e376c146a42b6339acdece3f8cd", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.36.1.linux-ppc64le", - "sha256": "46f71a277d1d05cb20f87601abfb729d0056f88705903bd82ad6153f80e3cd9b", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-ppc64le" + "file": "buildx-v0.37.0.linux-ppc64le", + "sha256": "ed99c4401ece2c6940d99c24b719332af9dfbbe8aba308c59676183a6285f376", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.36.1.linux-riscv64", - "sha256": "5e82f0ada635dabda74f1486dea604e0ea3a1214971ec8c52dcb4db6e08cce26", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-riscv64" + "file": "buildx-v0.37.0.linux-riscv64", + "sha256": "8de7783c3dae7b14b361a20d35b15d9368a31a85791da53e4e96e146c7ab120a", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.36.1.linux-s390x", - "sha256": "9d8dff974aa0166fc59a5804f35bb6c9ea0693a3f5061a81101668cfe707b0b4", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-s390x" + "file": "buildx-v0.37.0.linux-s390x", + "sha256": "5209e6d229cbaee67ee9a070abf2de96304ffcc2104edcf1475a0d5458f94a50", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.36.1.windows-amd64.exe", - "sha256": "cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe" + "file": "buildx-v0.37.0.windows-amd64.exe", + "sha256": "f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.36.1.windows-arm64.exe", - "sha256": "79522ff962bf3b127c8e9ca56944b1a3fcbe46e1d0b4144d481f356d8c13fa74", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-arm64.exe" + "file": "buildx-v0.37.0.windows-arm64.exe", + "sha256": "822457d04cd6d0685dce5e6f343cdca86f6dbeba6bae6302d033ff93e95c9d23", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-arm64.exe" } }, - "version": "0.36.1" + "version": "0.37.0" }, "compose": { "arches": { From 3538deee250ab25168e40ded34f526fac28edc30 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 2 Sep 2026 15:06:03 -0700 Subject: [PATCH 625/667] Update 29-rc to buildx 0.37.0 --- 29-rc/cli/Dockerfile | 30 ++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 104 +++++++++--------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 29d378976..dcabca547 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.36.1 +ENV DOCKER_BUILDX_VERSION 0.37.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-amd64'; \ - sha256='48af8a397ebd60178778bf63611dbcebe5f5e7a9be90eb9147b24b9587455778'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-amd64'; \ + sha256='ae43fa08c796b44efc86d7a63c55f73f7c35f3101188dea7bf93bcd6f99577ba'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v6'; \ - sha256='324ed0ca85defb28442eda3b002472dbfc7e77bf6992292f2daa94f699f0e43a'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v6'; \ + sha256='56229f2d8459f902ca4cad09e2a931e149ea7e10d8728fe4f0f315d66b76fe2c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v7'; \ - sha256='32ff9bee8c48c1fbceb1e2fb1d8472ec817ad1e25b5dff58ec9abf9b8d903518'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v7'; \ + sha256='9171f1aff0d6f48afd2248b493accc98d4c8d632e40698ad9444f872991acb13'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm64'; \ - sha256='5d0cafd9d16afe1a0f0d9529885344ace2cc99efdd531b6c783c5455a6001569'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm64'; \ + sha256='d263ce31bd2c9e9210aaa2c7537c67802bccabcd342e4c9fe4907085ddb41aa5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-ppc64le'; \ - sha256='46f71a277d1d05cb20f87601abfb729d0056f88705903bd82ad6153f80e3cd9b'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-ppc64le'; \ + sha256='ed99c4401ece2c6940d99c24b719332af9dfbbe8aba308c59676183a6285f376'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-riscv64'; \ - sha256='5e82f0ada635dabda74f1486dea604e0ea3a1214971ec8c52dcb4db6e08cce26'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-riscv64'; \ + sha256='8de7783c3dae7b14b361a20d35b15d9368a31a85791da53e4e96e146c7ab120a'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-s390x'; \ - sha256='9d8dff974aa0166fc59a5804f35bb6c9ea0693a3f5061a81101668cfe707b0b4'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-s390x'; \ + sha256='5209e6d229cbaee67ee9a070abf2de96304ffcc2104edcf1475a0d5458f94a50'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 72beb6208..82a677576 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.36.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330 +ENV DOCKER_BUILDX_VERSION 0.37.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index d2242332b..51cec1e68 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.36.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330 +ENV DOCKER_BUILDX_VERSION 0.37.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index f31f11920..7ef4ff0f8 100644 --- a/versions.json +++ b/versions.json @@ -202,92 +202,92 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.36.1.linux-amd64", - "sha256": "48af8a397ebd60178778bf63611dbcebe5f5e7a9be90eb9147b24b9587455778", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-amd64" + "file": "buildx-v0.37.0.linux-amd64", + "sha256": "ae43fa08c796b44efc86d7a63c55f73f7c35f3101188dea7bf93bcd6f99577ba", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.36.1.linux-arm-v6", - "sha256": "324ed0ca85defb28442eda3b002472dbfc7e77bf6992292f2daa94f699f0e43a", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v6" + "file": "buildx-v0.37.0.linux-arm-v6", + "sha256": "56229f2d8459f902ca4cad09e2a931e149ea7e10d8728fe4f0f315d66b76fe2c", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.36.1.linux-arm-v7", - "sha256": "32ff9bee8c48c1fbceb1e2fb1d8472ec817ad1e25b5dff58ec9abf9b8d903518", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm-v7" + "file": "buildx-v0.37.0.linux-arm-v7", + "sha256": "9171f1aff0d6f48afd2248b493accc98d4c8d632e40698ad9444f872991acb13", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.36.1.linux-arm64", - "sha256": "5d0cafd9d16afe1a0f0d9529885344ace2cc99efdd531b6c783c5455a6001569", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-arm64" + "file": "buildx-v0.37.0.linux-arm64", + "sha256": "d263ce31bd2c9e9210aaa2c7537c67802bccabcd342e4c9fe4907085ddb41aa5", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.36.1.darwin-amd64", - "sha256": "52a39ee4012d18f83373656712102ebda55656121dcdabbbb1ccfbd41b7debe8", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.darwin-amd64" + "file": "buildx-v0.37.0.darwin-amd64", + "sha256": "9d5a359608ffddbc9049eb0a8128db798a1fcc30cbfb2e451cb49ab99cbe0635", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.36.1.darwin-arm64", - "sha256": "214cdc36788602862dbc82b523d58648b4585c7b0ff95218b0817c44db5573d7", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.darwin-arm64" + "file": "buildx-v0.37.0.darwin-arm64", + "sha256": "4cf78bb790f96f576522af0db716c7c25e8937a71c3303a165ff90d5105170ff", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.36.1.freebsd-amd64", - "sha256": "43d8ce4bbbf981639db2ca441ab6d6c59cc015ae47e3882d2eb9f7cc035c4948", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.freebsd-amd64" + "file": "buildx-v0.37.0.freebsd-amd64", + "sha256": "17e7e624fcf8232fab6ee64258066f9b63967dba07d37ff6a7ae7f28d8f71174", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.36.1.freebsd-arm64", - "sha256": "8a9db4e9c1f6b900772759a0cb8078ec495cd3a1870e27b79fcbf7d527841178", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.freebsd-arm64" + "file": "buildx-v0.37.0.freebsd-arm64", + "sha256": "1a04292574a37b03906a139ae0c4432982aa3ba0d09ffa5dff88825f3d046901", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.36.1.netbsd-amd64", - "sha256": "9a71cbbec0fa124c68009c186299403108d49e278389b81f118f44b539285d56", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.netbsd-amd64" + "file": "buildx-v0.37.0.netbsd-amd64", + "sha256": "503693f34585e8d3a089d45bbbe1e5e7dc34d82d0c92a566b33e28ffe02cf458", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.36.1.netbsd-arm64", - "sha256": "e198b77ff748684ee984060679beaee419e3c4bbf7fe58340dcad9bc3dbd1335", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.netbsd-arm64" + "file": "buildx-v0.37.0.netbsd-arm64", + "sha256": "839bbf539b6852d82c49400ea208a46d82f6b4827ecd7b5243f3d3860e27218e", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.36.1.openbsd-amd64", - "sha256": "a1cb418e79ad7fa5c001d225d758d89acb94d931e5f612eebbcf34b9cf06141a", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.openbsd-amd64" + "file": "buildx-v0.37.0.openbsd-amd64", + "sha256": "15103c200a579b65b4d1dead390739685f9fa0f19fc9b05db5b9230918e5f234", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.36.1.openbsd-arm64", - "sha256": "6623871b27b50cf68dfeb2ea4c5fd918f7e867cc5eeb39474dbcc73a4321d9b9", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.openbsd-arm64" + "file": "buildx-v0.37.0.openbsd-arm64", + "sha256": "4cff41a3430f0f8173fd3975c648968e97da3e376c146a42b6339acdece3f8cd", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.36.1.linux-ppc64le", - "sha256": "46f71a277d1d05cb20f87601abfb729d0056f88705903bd82ad6153f80e3cd9b", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-ppc64le" + "file": "buildx-v0.37.0.linux-ppc64le", + "sha256": "ed99c4401ece2c6940d99c24b719332af9dfbbe8aba308c59676183a6285f376", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.36.1.linux-riscv64", - "sha256": "5e82f0ada635dabda74f1486dea604e0ea3a1214971ec8c52dcb4db6e08cce26", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-riscv64" + "file": "buildx-v0.37.0.linux-riscv64", + "sha256": "8de7783c3dae7b14b361a20d35b15d9368a31a85791da53e4e96e146c7ab120a", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.36.1.linux-s390x", - "sha256": "9d8dff974aa0166fc59a5804f35bb6c9ea0693a3f5061a81101668cfe707b0b4", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.linux-s390x" + "file": "buildx-v0.37.0.linux-s390x", + "sha256": "5209e6d229cbaee67ee9a070abf2de96304ffcc2104edcf1475a0d5458f94a50", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.36.1.windows-amd64.exe", - "sha256": "cd7d06a00d924b5800d2654b507afe100378a4685fcec6585eeadc599a527330", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-amd64.exe" + "file": "buildx-v0.37.0.windows-amd64.exe", + "sha256": "f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.36.1.windows-arm64.exe", - "sha256": "79522ff962bf3b127c8e9ca56944b1a3fcbe46e1d0b4144d481f356d8c13fa74", - "url": "https://github.com/docker/buildx/releases/download/v0.36.1/buildx-v0.36.1.windows-arm64.exe" + "file": "buildx-v0.37.0.windows-arm64.exe", + "sha256": "822457d04cd6d0685dce5e6f343cdca86f6dbeba6bae6302d033ff93e95c9d23", + "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-arm64.exe" } }, - "version": "0.36.1" + "version": "0.37.0" }, "compose": { "arches": { From 3362552d92866a27be1d1f70371523ca752470af Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 3 Sep 2026 09:04:14 -0700 Subject: [PATCH 626/667] Update 29 to compose 5.5.1 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 4df964a6f..5eba1fdff 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.5.0 +ENV DOCKER_COMPOSE_VERSION 5.5.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-x86_64'; \ - sha256='c57ab918abd5b05ca7e7d0f275875dd1330a695074f309dc9eab1b49efafcd4b'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64'; \ + sha256='db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv6'; \ - sha256='fad8dc4c8ab0a80395ccb3dbd3d7da46c85024818dcc7b90305ad6971de61f43'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6'; \ + sha256='421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv7'; \ - sha256='50a7c5bc659f0d619f71f5600b1f15981b99f86df6167d600e0445ef179d5a06'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7'; \ + sha256='32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-aarch64'; \ - sha256='ff42489f5a9b879d5d117c5ffea6defc27390b3286da8ad52cbc9c6ab5df590e'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64'; \ + sha256='732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-ppc64le'; \ - sha256='75fc29e87b04b7573c8deb7cf98ea4c2ab58b6c73f74a1d467ecc40485725be9'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le'; \ + sha256='1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-riscv64'; \ - sha256='d782b976282d629b6100477ddd4ed2e0439b0892e3d05d36bc4fc82fa1d6de5b'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64'; \ + sha256='d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-s390x'; \ - sha256='abf5f4044cec07af2dcf08e90629e95cb8efd61c877f60f02d7c11308cce105d'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x'; \ + sha256='58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 3fdd75579..a6ae5b45e 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.5.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19 +ENV DOCKER_COMPOSE_VERSION 5.5.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index ba9cf3253..ce811631b 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.5.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19 +ENV DOCKER_COMPOSE_VERSION 5.5.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 7ef4ff0f8..2c1e02dc7 100644 --- a/versions.json +++ b/versions.json @@ -113,61 +113,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "c57ab918abd5b05ca7e7d0f275875dd1330a695074f309dc9eab1b49efafcd4b", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-x86_64" + "sha256": "db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "fad8dc4c8ab0a80395ccb3dbd3d7da46c85024818dcc7b90305ad6971de61f43", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv6" + "sha256": "421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "50a7c5bc659f0d619f71f5600b1f15981b99f86df6167d600e0445ef179d5a06", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv7" + "sha256": "32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "ff42489f5a9b879d5d117c5ffea6defc27390b3286da8ad52cbc9c6ab5df590e", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-aarch64" + "sha256": "732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "d0f0c867fd740953899a63d6d1a291dc60200b0961de9612a01bcc560e6e29a6", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-darwin-x86_64" + "sha256": "a264d61e824bf08a78867e59cdf32eb09f0aee9ecdf9f6ebfa43f76dc52880f1", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "6777710e5a5db5709e5f4b5985844e74b73cc1a6123e3a6690b6ababf2deaf51", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-darwin-aarch64" + "sha256": "998735c9b6fe68a4f05895e6ea73d71ad06f9fc7046383ad89e47346781b6af5", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "75fc29e87b04b7573c8deb7cf98ea4c2ab58b6c73f74a1d467ecc40485725be9", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-ppc64le" + "sha256": "1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "d782b976282d629b6100477ddd4ed2e0439b0892e3d05d36bc4fc82fa1d6de5b", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-riscv64" + "sha256": "d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "abf5f4044cec07af2dcf08e90629e95cb8efd61c877f60f02d7c11308cce105d", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-s390x" + "sha256": "58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe" + "sha256": "a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "673b844868a8ebae57b81f3cfeffca8a00ed256e660a357c057191a40ffc83c2", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-aarch64.exe" + "sha256": "4bbb5d1ecc75bde1a9ca4afac43f5907c0d3bd0f88c7f00bf481ee7c8c1737be", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-aarch64.exe" } }, - "version": "5.5.0" + "version": "5.5.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 04392ff5aa0e9fa70a0f5b91129644a664b44218 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 3 Sep 2026 09:05:51 -0700 Subject: [PATCH 627/667] Update 29-rc to compose 5.5.1 --- 29-rc/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index dcabca547..a094a7133 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.5.0 +ENV DOCKER_COMPOSE_VERSION 5.5.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-x86_64'; \ - sha256='c57ab918abd5b05ca7e7d0f275875dd1330a695074f309dc9eab1b49efafcd4b'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64'; \ + sha256='db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv6'; \ - sha256='fad8dc4c8ab0a80395ccb3dbd3d7da46c85024818dcc7b90305ad6971de61f43'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6'; \ + sha256='421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv7'; \ - sha256='50a7c5bc659f0d619f71f5600b1f15981b99f86df6167d600e0445ef179d5a06'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7'; \ + sha256='32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-aarch64'; \ - sha256='ff42489f5a9b879d5d117c5ffea6defc27390b3286da8ad52cbc9c6ab5df590e'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64'; \ + sha256='732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-ppc64le'; \ - sha256='75fc29e87b04b7573c8deb7cf98ea4c2ab58b6c73f74a1d467ecc40485725be9'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le'; \ + sha256='1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-riscv64'; \ - sha256='d782b976282d629b6100477ddd4ed2e0439b0892e3d05d36bc4fc82fa1d6de5b'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64'; \ + sha256='d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-s390x'; \ - sha256='abf5f4044cec07af2dcf08e90629e95cb8efd61c877f60f02d7c11308cce105d'; \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x'; \ + sha256='58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 82a677576..7aa681c60 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.5.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19 +ENV DOCKER_COMPOSE_VERSION 5.5.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 51cec1e68..be0e7867d 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.5.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19 +ENV DOCKER_COMPOSE_VERSION 5.5.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 2c1e02dc7..107685038 100644 --- a/versions.json +++ b/versions.json @@ -293,61 +293,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "c57ab918abd5b05ca7e7d0f275875dd1330a695074f309dc9eab1b49efafcd4b", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-x86_64" + "sha256": "db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "fad8dc4c8ab0a80395ccb3dbd3d7da46c85024818dcc7b90305ad6971de61f43", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv6" + "sha256": "421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "50a7c5bc659f0d619f71f5600b1f15981b99f86df6167d600e0445ef179d5a06", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-armv7" + "sha256": "32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "ff42489f5a9b879d5d117c5ffea6defc27390b3286da8ad52cbc9c6ab5df590e", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-aarch64" + "sha256": "732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "d0f0c867fd740953899a63d6d1a291dc60200b0961de9612a01bcc560e6e29a6", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-darwin-x86_64" + "sha256": "a264d61e824bf08a78867e59cdf32eb09f0aee9ecdf9f6ebfa43f76dc52880f1", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "6777710e5a5db5709e5f4b5985844e74b73cc1a6123e3a6690b6ababf2deaf51", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-darwin-aarch64" + "sha256": "998735c9b6fe68a4f05895e6ea73d71ad06f9fc7046383ad89e47346781b6af5", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "75fc29e87b04b7573c8deb7cf98ea4c2ab58b6c73f74a1d467ecc40485725be9", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-ppc64le" + "sha256": "1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "d782b976282d629b6100477ddd4ed2e0439b0892e3d05d36bc4fc82fa1d6de5b", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-riscv64" + "sha256": "d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "abf5f4044cec07af2dcf08e90629e95cb8efd61c877f60f02d7c11308cce105d", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-linux-s390x" + "sha256": "58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "51e1e61195f3616896265487ed64551095f3bd27ac7fbd5758d3538c3bfa1b19", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-x86_64.exe" + "sha256": "a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "673b844868a8ebae57b81f3cfeffca8a00ed256e660a357c057191a40ffc83c2", - "url": "https://github.com/docker/compose/releases/download/v5.5.0/docker-compose-windows-aarch64.exe" + "sha256": "4bbb5d1ecc75bde1a9ca4afac43f5907c0d3bd0f88c7f00bf481ee7c8c1737be", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-aarch64.exe" } }, - "version": "5.5.0" + "version": "5.5.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 5f026945bb973d8c2fbd97687c55b3a518ae057c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 3 Sep 2026 21:04:14 -0700 Subject: [PATCH 628/667] Update 29 to 29.8.0 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 5eba1fdff..e0462e1ba 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.7.2 +ENV DOCKER_VERSION 29.8.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.7.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.8.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index cfbb3910f..9d86ffeaf 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.7.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.8.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 7ca002e9e..12a47cc9e 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -61,16 +61,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.7.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.8.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index a6ae5b45e..2c2a5881a 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.7.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.2.zip +ENV DOCKER_VERSION 29.8.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.0.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index ce811631b..df1f0c094 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.7.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.2.zip +ENV DOCKER_VERSION 29.8.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.0.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/versions.json b/versions.json index 107685038..c2977f4c2 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.7.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.7.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.8.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.8.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.7.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.8.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.7.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.8.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.7.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.8.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.7.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.8.0.zip" } }, "buildx": { @@ -177,7 +177,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.7.2" + "version": "29.8.0" }, "29-rc": { "arches": { From 03ba4801e72bce17d6e40f2c13b7754ebc298cb5 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 3 Sep 2026 21:05:56 -0700 Subject: [PATCH 629/667] Update 29-rc --- 29-rc/cli/Dockerfile | 167 ------------ 29-rc/cli/docker-entrypoint.sh | 61 ----- 29-rc/cli/modprobe.sh | 20 -- 29-rc/dind-rootless/Dockerfile | 54 ---- 29-rc/dind/Dockerfile | 108 -------- 29-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 181 +------------ 9 files changed, 1 insertion(+), 1010 deletions(-) delete mode 100644 29-rc/cli/Dockerfile delete mode 100755 29-rc/cli/docker-entrypoint.sh delete mode 100755 29-rc/cli/modprobe.sh delete mode 100644 29-rc/dind-rootless/Dockerfile delete mode 100644 29-rc/dind/Dockerfile delete mode 100755 29-rc/dind/dockerd-entrypoint.sh delete mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile deleted file mode 100644 index a094a7133..000000000 --- a/29-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.24 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 29.8.0-rc.1 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.8.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.8.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.8.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.8.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.37.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-amd64'; \ - sha256='ae43fa08c796b44efc86d7a63c55f73f7c35f3101188dea7bf93bcd6f99577ba'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v6'; \ - sha256='56229f2d8459f902ca4cad09e2a931e149ea7e10d8728fe4f0f315d66b76fe2c'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v7'; \ - sha256='9171f1aff0d6f48afd2248b493accc98d4c8d632e40698ad9444f872991acb13'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm64'; \ - sha256='d263ce31bd2c9e9210aaa2c7537c67802bccabcd342e4c9fe4907085ddb41aa5'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-ppc64le'; \ - sha256='ed99c4401ece2c6940d99c24b719332af9dfbbe8aba308c59676183a6285f376'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-riscv64'; \ - sha256='8de7783c3dae7b14b361a20d35b15d9368a31a85791da53e4e96e146c7ab120a'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-s390x'; \ - sha256='5209e6d229cbaee67ee9a070abf2de96304ffcc2104edcf1475a0d5458f94a50'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 5.5.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64'; \ - sha256='db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6'; \ - sha256='421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7'; \ - sha256='32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64'; \ - sha256='732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le'; \ - sha256='1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64'; \ - sha256='d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x'; \ - sha256='58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/29-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/29-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile deleted file mode 100644 index 70c5da341..000000000 --- a/29-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-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 -# slirp4netns is recommended as rootlesskit's net driver -# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.8.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.8.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile deleted file mode 100644 index 808086af1..000000000 --- a/29-rc/dind/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-rc-cli - -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 -RUN set -eux; \ - apk add --no-cache \ - btrfs-progs \ - e2fsprogs \ - e2fsprogs-extra \ - git \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xfsprogs \ - xz \ - zfs \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.8.0-rc.1.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.8.0-rc.1.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.8.0-rc.1.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.8.0-rc.1.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - containerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 77ff1aab3..000000000 --- a/29-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 7aa681c60..000000000 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.8.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.8.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.37.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.5.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index be0e7867d..000000000 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.8.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.8.0-rc.1.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.37.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.5.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index c2977f4c2..10bf6fb36 100644 --- a/versions.json +++ b/versions.json @@ -179,184 +179,5 @@ ], "version": "29.8.0" }, - "29-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.8.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.8.0-rc.1.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.8.0-rc.1.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.8.0-rc.1.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.8.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.8.0-rc.1.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.8.0-rc.1.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.37.0.linux-amd64", - "sha256": "ae43fa08c796b44efc86d7a63c55f73f7c35f3101188dea7bf93bcd6f99577ba", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.37.0.linux-arm-v6", - "sha256": "56229f2d8459f902ca4cad09e2a931e149ea7e10d8728fe4f0f315d66b76fe2c", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.37.0.linux-arm-v7", - "sha256": "9171f1aff0d6f48afd2248b493accc98d4c8d632e40698ad9444f872991acb13", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.37.0.linux-arm64", - "sha256": "d263ce31bd2c9e9210aaa2c7537c67802bccabcd342e4c9fe4907085ddb41aa5", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm64" - }, - "darwin-amd64": { - "file": "buildx-v0.37.0.darwin-amd64", - "sha256": "9d5a359608ffddbc9049eb0a8128db798a1fcc30cbfb2e451cb49ab99cbe0635", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.darwin-amd64" - }, - "darwin-arm64v8": { - "file": "buildx-v0.37.0.darwin-arm64", - "sha256": "4cf78bb790f96f576522af0db716c7c25e8937a71c3303a165ff90d5105170ff", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.darwin-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.37.0.freebsd-amd64", - "sha256": "17e7e624fcf8232fab6ee64258066f9b63967dba07d37ff6a7ae7f28d8f71174", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.37.0.freebsd-arm64", - "sha256": "1a04292574a37b03906a139ae0c4432982aa3ba0d09ffa5dff88825f3d046901", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.37.0.netbsd-amd64", - "sha256": "503693f34585e8d3a089d45bbbe1e5e7dc34d82d0c92a566b33e28ffe02cf458", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.37.0.netbsd-arm64", - "sha256": "839bbf539b6852d82c49400ea208a46d82f6b4827ecd7b5243f3d3860e27218e", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.37.0.openbsd-amd64", - "sha256": "15103c200a579b65b4d1dead390739685f9fa0f19fc9b05db5b9230918e5f234", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.37.0.openbsd-arm64", - "sha256": "4cff41a3430f0f8173fd3975c648968e97da3e376c146a42b6339acdece3f8cd", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.37.0.linux-ppc64le", - "sha256": "ed99c4401ece2c6940d99c24b719332af9dfbbe8aba308c59676183a6285f376", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.37.0.linux-riscv64", - "sha256": "8de7783c3dae7b14b361a20d35b15d9368a31a85791da53e4e96e146c7ab120a", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.37.0.linux-s390x", - "sha256": "5209e6d229cbaee67ee9a070abf2de96304ffcc2104edcf1475a0d5458f94a50", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.37.0.windows-amd64.exe", - "sha256": "f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.37.0.windows-arm64.exe", - "sha256": "822457d04cd6d0685dce5e6f343cdca86f6dbeba6bae6302d033ff93e95c9d23", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-arm64.exe" - } - }, - "version": "0.37.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "a264d61e824bf08a78867e59cdf32eb09f0aee9ecdf9f6ebfa43f76dc52880f1", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "998735c9b6fe68a4f05895e6ea73d71ad06f9fc7046383ad89e47346781b6af5", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "4bbb5d1ecc75bde1a9ca4afac43f5907c0d3bd0f88c7f00bf481ee7c8c1737be", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-aarch64.exe" - } - }, - "version": "5.5.1" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "29.8.0-rc.1" - } + "29-rc": null } From 1b75aaf94eff7e00df393cb7358d7762e59c98f0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 4 Sep 2026 15:17:40 +0200 Subject: [PATCH 630/667] dind: remove btrfs-progs dependency The btrfs storage driver no longer requires the btrfs userspace utilities at runtime. Moby switched its btrfs implementation to use the kernel UAPI directly in v23.0, removing its dependency on libbtrfs/btrfs-progs. Containerd similarly switched its btrfs snapshotter to use the kernel UAPI through containerd/btrfs/v2 in containerd 1.7, making kernel headers a build-time dependency instead of requiring btrfs-progs at runtime. Remove btrfs-progs from the dind image, as neither the Moby btrfs storage driver nor containerd's btrfs snapshotter requires it. - https://github.com/moby/moby/commit/3208dcabdc8997340b255f5b880fef4e3f54580d - https://github.com/containerd/containerd/commit/52f82acb7b3984fcb143af50c29a0ac0ceb5dc5d Signed-off-by: Sebastiaan van Stijn --- 29/dind/Dockerfile | 1 - Dockerfile-dind.template | 1 - 2 files changed, 2 deletions(-) diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 12a47cc9e..48b2212bb 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -10,7 +10,6 @@ FROM docker:29-cli # https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 RUN set -eux; \ apk add --no-cache \ - btrfs-progs \ e2fsprogs \ e2fsprogs-extra \ git \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 75d30e7df..a6d9ec114 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -5,7 +5,6 @@ FROM docker:{{ env.version }}-cli # https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 RUN set -eux; \ apk add --no-cache \ - btrfs-progs \ e2fsprogs \ e2fsprogs-extra \ git \ From 3806f369440a6bbe66e17a8eaf046f2576a7e58a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 4 Sep 2026 15:20:57 +0200 Subject: [PATCH 631/667] dind: remove e2fsprogs and xfsprogs dependencies The e2fsprogs, e2fsprogs-extra, and xfsprogs packages were runtime dependencies of the devicemapper storage driver, providing the tools used to create and configure ext4 and XFS filesystems. The devicemapper storage driver was disabled by default in Docker Engine v23.0 and removed in v25.0. None of these filesystem utilities are required by the remaining storage drivers. Remove e2fsprogs, e2fsprogs-extra, and xfsprogs from the dind image. - https://docs.docker.com/engine/deprecated/#device-mapper-storage-driver Signed-off-by: Sebastiaan van Stijn --- 29/dind/Dockerfile | 3 --- Dockerfile-dind.template | 3 --- 2 files changed, 6 deletions(-) diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 48b2212bb..12babdc5a 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -10,15 +10,12 @@ FROM docker:29-cli # https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 RUN set -eux; \ apk add --no-cache \ - e2fsprogs \ - e2fsprogs-extra \ git \ ip6tables \ iptables \ openssl \ pigz \ shadow-uidmap \ - xfsprogs \ xz \ zfs \ ; diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index a6d9ec114..034b1029e 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -5,15 +5,12 @@ FROM docker:{{ env.version }}-cli # https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 RUN set -eux; \ apk add --no-cache \ - e2fsprogs \ - e2fsprogs-extra \ git \ ip6tables \ iptables \ openssl \ pigz \ shadow-uidmap \ - xfsprogs \ xz \ zfs \ ; From 27c828f21018d680dc1e68b95e8ce9df7caa236f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 4 Sep 2026 15:24:56 +0200 Subject: [PATCH 632/667] dind: remove duplicate git dependency Git was originally added explicitly to the dind variants when the separate git variant was folded into dind. It was later added to the CLI variants as well, to support build and buildx workflows that invoke git. As the dind image is based on the CLI image, git is now inherited from its parent and no longer needs to be installed again. Remove the redundant git package from the dind dependencies. - https://github.com/docker-library/docker/commit/485fefe743baed5a2dd9e5d22b685c14eda4c61e - https://github.com/docker-library/docker/commit/b348a31fc955dd6500a4aa9537bbef51688a181e Signed-off-by: Sebastiaan van Stijn --- 29/dind/Dockerfile | 1 - Dockerfile-dind.template | 1 - 2 files changed, 2 deletions(-) diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 12babdc5a..cc5f32a5c 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -10,7 +10,6 @@ FROM docker:29-cli # https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 RUN set -eux; \ apk add --no-cache \ - git \ ip6tables \ iptables \ openssl \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 034b1029e..e671bcdae 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -5,7 +5,6 @@ FROM docker:{{ env.version }}-cli # https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 RUN set -eux; \ apk add --no-cache \ - git \ ip6tables \ iptables \ openssl \ From f86144766362a70f2a532425bfad4b6602237149 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 4 Sep 2026 15:45:33 +0200 Subject: [PATCH 633/667] dind: update links for runtime-dependencies Signed-off-by: Sebastiaan van Stijn --- 29/dind/Dockerfile | 5 +++-- Dockerfile-dind.template | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index cc5f32a5c..a6a1802fb 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -6,8 +6,9 @@ FROM docker:29-cli -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +# Runtime dependencies: +# - https://github.com/moby/moby/blob/864598f8c2677189e308eb4a3b3c0dd41fc06599/project/PACKAGERS.md#runtime-dependencies#runtime-dependencies +# - https://github.com/docker/packaging/blob/0ba325d178593583f190dc91566214a85c3880ad/pkg/docker-engine/deb/control#L24-L36 RUN set -eux; \ apk add --no-cache \ ip6tables \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index e671bcdae..1767d0bf4 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -1,8 +1,9 @@ {{ include "shared" -}} FROM docker:{{ env.version }}-cli -# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies -# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41 +# Runtime dependencies: +# - https://github.com/moby/moby/blob/864598f8c2677189e308eb4a3b3c0dd41fc06599/project/PACKAGERS.md#runtime-dependencies#runtime-dependencies +# - https://github.com/docker/packaging/blob/0ba325d178593583f190dc91566214a85c3880ad/pkg/docker-engine/deb/control#L24-L36 RUN set -eux; \ apk add --no-cache \ ip6tables \ From 698da0441cba50a9cf2739dd3283e5f4ef9d7235 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 11 Sep 2026 09:04:13 -0700 Subject: [PATCH 634/667] Update 29 to buildx 0.37.1 --- 29/cli/Dockerfile | 30 ++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 104 +++++++++--------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index e0462e1ba..9020c7b21 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.37.0 +ENV DOCKER_BUILDX_VERSION 0.37.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-amd64'; \ - sha256='ae43fa08c796b44efc86d7a63c55f73f7c35f3101188dea7bf93bcd6f99577ba'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-amd64'; \ + sha256='9447199cdb435f25880548343c128a4b6650e8891ee598905d8d29d39a8e359b'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v6'; \ - sha256='56229f2d8459f902ca4cad09e2a931e149ea7e10d8728fe4f0f315d66b76fe2c'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm-v6'; \ + sha256='3264d18a218bdc7107477f69dec6a303cbdf4a3454f402c60a14084b89ce3251'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v7'; \ - sha256='9171f1aff0d6f48afd2248b493accc98d4c8d632e40698ad9444f872991acb13'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm-v7'; \ + sha256='9ce373553b2ea4ef6bc8e5b33e7586d14c2d8d91539d3b96ac47ad0967a73843'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm64'; \ - sha256='d263ce31bd2c9e9210aaa2c7537c67802bccabcd342e4c9fe4907085ddb41aa5'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm64'; \ + sha256='e5cc9fe3bbff5cbc91230981f7860e06076110730a2db997082652199042a1f2'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-ppc64le'; \ - sha256='ed99c4401ece2c6940d99c24b719332af9dfbbe8aba308c59676183a6285f376'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-ppc64le'; \ + sha256='bd6bb13228a012d34d259c04de1a38c4f5c76485d9a2d15397794cde2634c3fe'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-riscv64'; \ - sha256='8de7783c3dae7b14b361a20d35b15d9368a31a85791da53e4e96e146c7ab120a'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-riscv64'; \ + sha256='d23f968ff6dc1964ab172de280bd0de24c12f0f8131af76f69104d2f6de19cbd'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-s390x'; \ - sha256='5209e6d229cbaee67ee9a070abf2de96304ffcc2104edcf1475a0d5458f94a50'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-s390x'; \ + sha256='7659b0d977e4a4376e360ea25d1dc626a3af7b34695bb272ec49b056bd303548'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 2c2a5881a..5f545e010 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.37.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b +ENV DOCKER_BUILDX_VERSION 0.37.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3904abb2802f9bd83a2bf483b35bba81c57a4e0baff981e6886564c461f908b3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index df1f0c094..ed927f7c2 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.37.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b +ENV DOCKER_BUILDX_VERSION 0.37.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 3904abb2802f9bd83a2bf483b35bba81c57a4e0baff981e6886564c461f908b3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 10bf6fb36..f058e0154 100644 --- a/versions.json +++ b/versions.json @@ -22,92 +22,92 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.37.0.linux-amd64", - "sha256": "ae43fa08c796b44efc86d7a63c55f73f7c35f3101188dea7bf93bcd6f99577ba", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-amd64" + "file": "buildx-v0.37.1.linux-amd64", + "sha256": "9447199cdb435f25880548343c128a4b6650e8891ee598905d8d29d39a8e359b", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.37.0.linux-arm-v6", - "sha256": "56229f2d8459f902ca4cad09e2a931e149ea7e10d8728fe4f0f315d66b76fe2c", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v6" + "file": "buildx-v0.37.1.linux-arm-v6", + "sha256": "3264d18a218bdc7107477f69dec6a303cbdf4a3454f402c60a14084b89ce3251", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.37.0.linux-arm-v7", - "sha256": "9171f1aff0d6f48afd2248b493accc98d4c8d632e40698ad9444f872991acb13", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm-v7" + "file": "buildx-v0.37.1.linux-arm-v7", + "sha256": "9ce373553b2ea4ef6bc8e5b33e7586d14c2d8d91539d3b96ac47ad0967a73843", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.37.0.linux-arm64", - "sha256": "d263ce31bd2c9e9210aaa2c7537c67802bccabcd342e4c9fe4907085ddb41aa5", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-arm64" + "file": "buildx-v0.37.1.linux-arm64", + "sha256": "e5cc9fe3bbff5cbc91230981f7860e06076110730a2db997082652199042a1f2", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.37.0.darwin-amd64", - "sha256": "9d5a359608ffddbc9049eb0a8128db798a1fcc30cbfb2e451cb49ab99cbe0635", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.darwin-amd64" + "file": "buildx-v0.37.1.darwin-amd64", + "sha256": "7003a7bae20e7741283db1e23dafdcb957776a8be85de3f459630b1dd4c19db0", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.37.0.darwin-arm64", - "sha256": "4cf78bb790f96f576522af0db716c7c25e8937a71c3303a165ff90d5105170ff", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.darwin-arm64" + "file": "buildx-v0.37.1.darwin-arm64", + "sha256": "c3cbbc820d578b0aa8158dd62ef1af25a0c8a75ef53331dbe4e219471e1dbe8c", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.37.0.freebsd-amd64", - "sha256": "17e7e624fcf8232fab6ee64258066f9b63967dba07d37ff6a7ae7f28d8f71174", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.freebsd-amd64" + "file": "buildx-v0.37.1.freebsd-amd64", + "sha256": "875365bbc8d9e1100812c312534f0d026fa689ccf4c4fe8508bde4392c50f762", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.37.0.freebsd-arm64", - "sha256": "1a04292574a37b03906a139ae0c4432982aa3ba0d09ffa5dff88825f3d046901", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.freebsd-arm64" + "file": "buildx-v0.37.1.freebsd-arm64", + "sha256": "75a56c3c646fdbb9d93eb3cc5589317c26d766e8e9eff42175cad3d2ac7729e5", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.37.0.netbsd-amd64", - "sha256": "503693f34585e8d3a089d45bbbe1e5e7dc34d82d0c92a566b33e28ffe02cf458", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.netbsd-amd64" + "file": "buildx-v0.37.1.netbsd-amd64", + "sha256": "b0633fa5fe28eca7ae89dd8f831d55a5a4efc03750a172bc3a2fa49644a13c4f", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.37.0.netbsd-arm64", - "sha256": "839bbf539b6852d82c49400ea208a46d82f6b4827ecd7b5243f3d3860e27218e", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.netbsd-arm64" + "file": "buildx-v0.37.1.netbsd-arm64", + "sha256": "8649f7988e33610d1ed0f3cdcac2681847618fa753cdecc2a68407725f09d0c9", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.37.0.openbsd-amd64", - "sha256": "15103c200a579b65b4d1dead390739685f9fa0f19fc9b05db5b9230918e5f234", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.openbsd-amd64" + "file": "buildx-v0.37.1.openbsd-amd64", + "sha256": "5cd11c4da088cd06cbf7aeacd90dcbeef88e4dba6239e104fa315965cb6690c6", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.37.0.openbsd-arm64", - "sha256": "4cff41a3430f0f8173fd3975c648968e97da3e376c146a42b6339acdece3f8cd", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.openbsd-arm64" + "file": "buildx-v0.37.1.openbsd-arm64", + "sha256": "416dcaccd2dc6c302b75323fe6c18c46c5d3774aa2ceeca9d693c2ec7cf7433d", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.37.0.linux-ppc64le", - "sha256": "ed99c4401ece2c6940d99c24b719332af9dfbbe8aba308c59676183a6285f376", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-ppc64le" + "file": "buildx-v0.37.1.linux-ppc64le", + "sha256": "bd6bb13228a012d34d259c04de1a38c4f5c76485d9a2d15397794cde2634c3fe", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.37.0.linux-riscv64", - "sha256": "8de7783c3dae7b14b361a20d35b15d9368a31a85791da53e4e96e146c7ab120a", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-riscv64" + "file": "buildx-v0.37.1.linux-riscv64", + "sha256": "d23f968ff6dc1964ab172de280bd0de24c12f0f8131af76f69104d2f6de19cbd", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.37.0.linux-s390x", - "sha256": "5209e6d229cbaee67ee9a070abf2de96304ffcc2104edcf1475a0d5458f94a50", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.linux-s390x" + "file": "buildx-v0.37.1.linux-s390x", + "sha256": "7659b0d977e4a4376e360ea25d1dc626a3af7b34695bb272ec49b056bd303548", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.37.0.windows-amd64.exe", - "sha256": "f49fa81c676e178ebac4679cc33c6560f14a56b586f33c9e298a917313cd909b", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-amd64.exe" + "file": "buildx-v0.37.1.windows-amd64.exe", + "sha256": "3904abb2802f9bd83a2bf483b35bba81c57a4e0baff981e6886564c461f908b3", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.37.0.windows-arm64.exe", - "sha256": "822457d04cd6d0685dce5e6f343cdca86f6dbeba6bae6302d033ff93e95c9d23", - "url": "https://github.com/docker/buildx/releases/download/v0.37.0/buildx-v0.37.0.windows-arm64.exe" + "file": "buildx-v0.37.1.windows-arm64.exe", + "sha256": "bdf356a5f2c8f3efd8a357b1f044860216e15e654a9a7105ca4e5dd5b5697ee4", + "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.windows-arm64.exe" } }, - "version": "0.37.0" + "version": "0.37.1" }, "compose": { "arches": { From 500a09e1415f07c22238dd894ba7fda08dceee0f Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 15 Sep 2026 15:04:13 -0700 Subject: [PATCH 635/667] Update 29 to 29.8.1 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 9020c7b21..d3a49abe6 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.8.0 +ENV DOCKER_VERSION 29.8.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.8.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.8.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 9d86ffeaf..3a7313dc5 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.8.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.8.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index a6a1802fb..a0a47a305 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -57,16 +57,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.8.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.8.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 5f545e010..241fd4e98 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.8.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.0.zip +ENV DOCKER_VERSION 29.8.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.1.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index ed927f7c2..28f797e00 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.8.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.0.zip +ENV DOCKER_VERSION 29.8.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.1.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/versions.json b/versions.json index f058e0154..c7c2dcf92 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.8.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.8.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.8.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.8.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.8.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.8.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.8.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.8.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.8.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.8.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.8.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.8.1.zip" } }, "buildx": { @@ -177,7 +177,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.8.0" + "version": "29.8.1" }, "29-rc": null } From 868418aadf5d09cf67ddd5e11ba01b16b7fe0f53 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 16 Sep 2026 00:44:25 +0200 Subject: [PATCH 636/667] dind: remove zfs dependency (#586) The zfs utilities were used by the zfs graph-driver. containerd provides an optional zfs-snapshotter, but it's not installed by default. Remove the dependency, as it's not used in the default configuration. Signed-off-by: Sebastiaan van Stijn --- 29/dind/Dockerfile | 1 - Dockerfile-dind.template | 1 - 2 files changed, 2 deletions(-) diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index a0a47a305..886fa6c43 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -17,7 +17,6 @@ RUN set -eux; \ pigz \ shadow-uidmap \ xz \ - zfs \ ; # dind might be used on systems where the nf_tables kernel module isn't available. In that case, diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 1767d0bf4..873144424 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -12,7 +12,6 @@ RUN set -eux; \ pigz \ shadow-uidmap \ xz \ - zfs \ ; # dind might be used on systems where the nf_tables kernel module isn't available. In that case, From d576eb69d7bad654b934176e95644995aa85d8f8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 30 Sep 2026 15:04:14 -0700 Subject: [PATCH 637/667] Update 29 to 29.8.2, buildx 0.37.2 --- 29/cli/Dockerfile | 40 +++--- 29/dind-rootless/Dockerfile | 4 +- 29/dind/Dockerfile | 8 +- .../windowsservercore-ltsc2022/Dockerfile | 10 +- .../windowsservercore-ltsc2025/Dockerfile | 10 +- versions.json | 120 +++++++++--------- 6 files changed, 96 insertions(+), 96 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index d3a49abe6..7b843503a 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.8.1 +ENV DOCKER_VERSION 29.8.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.8.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.8.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.37.1 +ENV DOCKER_BUILDX_VERSION 0.37.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-amd64'; \ - sha256='9447199cdb435f25880548343c128a4b6650e8891ee598905d8d29d39a8e359b'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-amd64'; \ + sha256='982ca20490b45ed1ec8d99795974d3d874a358f75938c9c237305010e6b7e548'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm-v6'; \ - sha256='3264d18a218bdc7107477f69dec6a303cbdf4a3454f402c60a14084b89ce3251'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v6'; \ + sha256='53a8d26bde4af99ce5123abec1d79f6c778cd22ad0c18bab1ae2056302b32805'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm-v7'; \ - sha256='9ce373553b2ea4ef6bc8e5b33e7586d14c2d8d91539d3b96ac47ad0967a73843'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v7'; \ + sha256='82ce19352521eec762566346d48eb04f1f66ecf4fef6385fa903503c5530367a'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm64'; \ - sha256='e5cc9fe3bbff5cbc91230981f7860e06076110730a2db997082652199042a1f2'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm64'; \ + sha256='efa38cb7aa7db2dbb9ad049b00b0a9737f66f033626177b5a4e845184ad7ab29'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-ppc64le'; \ - sha256='bd6bb13228a012d34d259c04de1a38c4f5c76485d9a2d15397794cde2634c3fe'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-ppc64le'; \ + sha256='59b5565dba49775232e1c14f29342c1453ca40ee5edf57ca016a7ee123780afa'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-riscv64'; \ - sha256='d23f968ff6dc1964ab172de280bd0de24c12f0f8131af76f69104d2f6de19cbd'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-riscv64'; \ + sha256='0678850b5e49218e0c22990a1b9a9ea1e0835d92a89f01a21dc7e9c85033826b'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-s390x'; \ - sha256='7659b0d977e4a4376e360ea25d1dc626a3af7b34695bb272ec49b056bd303548'; \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-s390x'; \ + sha256='1c43e151e84cf570a1124215ba15f92b6b240eac4c83115a94b8378b54409f3c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 3a7313dc5..54b833747 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.8.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.8.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 886fa6c43..b23dd6bc9 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -56,16 +56,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.8.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.8.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 241fd4e98..2c37b8614 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.8.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.1.zip +ENV DOCKER_VERSION 29.8.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.2.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) @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.37.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3904abb2802f9bd83a2bf483b35bba81c57a4e0baff981e6886564c461f908b3 +ENV DOCKER_BUILDX_VERSION 0.37.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 28f797e00..3249fe345 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.8.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.1.zip +ENV DOCKER_VERSION 29.8.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.2.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) @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.37.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 3904abb2802f9bd83a2bf483b35bba81c57a4e0baff981e6886564c461f908b3 +ENV DOCKER_BUILDX_VERSION 0.37.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index c7c2dcf92..72fd020b5 100644 --- a/versions.json +++ b/versions.json @@ -2,112 +2,112 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.8.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.8.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.8.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.8.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.8.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.8.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.8.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.8.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.8.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.8.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.8.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.8.2.zip" } }, "buildx": { "arches": { "amd64": { - "file": "buildx-v0.37.1.linux-amd64", - "sha256": "9447199cdb435f25880548343c128a4b6650e8891ee598905d8d29d39a8e359b", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-amd64" + "file": "buildx-v0.37.2.linux-amd64", + "sha256": "982ca20490b45ed1ec8d99795974d3d874a358f75938c9c237305010e6b7e548", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.37.1.linux-arm-v6", - "sha256": "3264d18a218bdc7107477f69dec6a303cbdf4a3454f402c60a14084b89ce3251", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm-v6" + "file": "buildx-v0.37.2.linux-arm-v6", + "sha256": "53a8d26bde4af99ce5123abec1d79f6c778cd22ad0c18bab1ae2056302b32805", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.37.1.linux-arm-v7", - "sha256": "9ce373553b2ea4ef6bc8e5b33e7586d14c2d8d91539d3b96ac47ad0967a73843", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm-v7" + "file": "buildx-v0.37.2.linux-arm-v7", + "sha256": "82ce19352521eec762566346d48eb04f1f66ecf4fef6385fa903503c5530367a", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.37.1.linux-arm64", - "sha256": "e5cc9fe3bbff5cbc91230981f7860e06076110730a2db997082652199042a1f2", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-arm64" + "file": "buildx-v0.37.2.linux-arm64", + "sha256": "efa38cb7aa7db2dbb9ad049b00b0a9737f66f033626177b5a4e845184ad7ab29", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.37.1.darwin-amd64", - "sha256": "7003a7bae20e7741283db1e23dafdcb957776a8be85de3f459630b1dd4c19db0", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.darwin-amd64" + "file": "buildx-v0.37.2.darwin-amd64", + "sha256": "91cfde39945b0a76f0320db72d16f22ddf320da1d7a967b6871369041577cb88", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.37.1.darwin-arm64", - "sha256": "c3cbbc820d578b0aa8158dd62ef1af25a0c8a75ef53331dbe4e219471e1dbe8c", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.darwin-arm64" + "file": "buildx-v0.37.2.darwin-arm64", + "sha256": "149e6a006edaa430f297b2bdcf65baaa6d7ee5ccfc7aa67dd50ce1c2b1db47e2", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.37.1.freebsd-amd64", - "sha256": "875365bbc8d9e1100812c312534f0d026fa689ccf4c4fe8508bde4392c50f762", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.freebsd-amd64" + "file": "buildx-v0.37.2.freebsd-amd64", + "sha256": "2d1f787da047520c11d6a76e8a200181e1f7793a12e9b2d5d4d5c1c7fdc66af0", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.37.1.freebsd-arm64", - "sha256": "75a56c3c646fdbb9d93eb3cc5589317c26d766e8e9eff42175cad3d2ac7729e5", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.freebsd-arm64" + "file": "buildx-v0.37.2.freebsd-arm64", + "sha256": "c460c6bbba6907e13237fd96107c03702665303c03e9e9062af64a3dae09556e", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.37.1.netbsd-amd64", - "sha256": "b0633fa5fe28eca7ae89dd8f831d55a5a4efc03750a172bc3a2fa49644a13c4f", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.netbsd-amd64" + "file": "buildx-v0.37.2.netbsd-amd64", + "sha256": "18a4e9750d394f44c0d06385691ae25739802b2432e1eae7dc1b3b9e5550d37f", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.37.1.netbsd-arm64", - "sha256": "8649f7988e33610d1ed0f3cdcac2681847618fa753cdecc2a68407725f09d0c9", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.netbsd-arm64" + "file": "buildx-v0.37.2.netbsd-arm64", + "sha256": "fbc072e03eace54b0e2ae0913a05fced7c0d345c442e8bfb981ee5a2ddfdd57a", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.37.1.openbsd-amd64", - "sha256": "5cd11c4da088cd06cbf7aeacd90dcbeef88e4dba6239e104fa315965cb6690c6", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.openbsd-amd64" + "file": "buildx-v0.37.2.openbsd-amd64", + "sha256": "dbb306b2742d9ce78d0d837a21ed05e64970891312cb03be48ad93eaad63bc94", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.37.1.openbsd-arm64", - "sha256": "416dcaccd2dc6c302b75323fe6c18c46c5d3774aa2ceeca9d693c2ec7cf7433d", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.openbsd-arm64" + "file": "buildx-v0.37.2.openbsd-arm64", + "sha256": "abfa3d90949cef579531bb70a342271a31e8d23d68996993aa53a40c2eac8bc5", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.37.1.linux-ppc64le", - "sha256": "bd6bb13228a012d34d259c04de1a38c4f5c76485d9a2d15397794cde2634c3fe", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-ppc64le" + "file": "buildx-v0.37.2.linux-ppc64le", + "sha256": "59b5565dba49775232e1c14f29342c1453ca40ee5edf57ca016a7ee123780afa", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.37.1.linux-riscv64", - "sha256": "d23f968ff6dc1964ab172de280bd0de24c12f0f8131af76f69104d2f6de19cbd", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-riscv64" + "file": "buildx-v0.37.2.linux-riscv64", + "sha256": "0678850b5e49218e0c22990a1b9a9ea1e0835d92a89f01a21dc7e9c85033826b", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.37.1.linux-s390x", - "sha256": "7659b0d977e4a4376e360ea25d1dc626a3af7b34695bb272ec49b056bd303548", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.linux-s390x" + "file": "buildx-v0.37.2.linux-s390x", + "sha256": "1c43e151e84cf570a1124215ba15f92b6b240eac4c83115a94b8378b54409f3c", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.37.1.windows-amd64.exe", - "sha256": "3904abb2802f9bd83a2bf483b35bba81c57a4e0baff981e6886564c461f908b3", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.windows-amd64.exe" + "file": "buildx-v0.37.2.windows-amd64.exe", + "sha256": "39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.37.1.windows-arm64.exe", - "sha256": "bdf356a5f2c8f3efd8a357b1f044860216e15e654a9a7105ca4e5dd5b5697ee4", - "url": "https://github.com/docker/buildx/releases/download/v0.37.1/buildx-v0.37.1.windows-arm64.exe" + "file": "buildx-v0.37.2.windows-arm64.exe", + "sha256": "43d910e930b1ebc3461a3e88750ac5bdc11bb97cf03f30ab77ad4b1c2c5990c3", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-arm64.exe" } }, - "version": "0.37.1" + "version": "0.37.2" }, "compose": { "arches": { @@ -177,7 +177,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.8.1" + "version": "29.8.2" }, "29-rc": null } From ec920f42cff6c1154d4f3ac38f3f420e303ef561 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 1 Oct 2026 23:30:08 +0200 Subject: [PATCH 638/667] remove containerd, ctr and use embedded containerd (#585) before/after: docker image ls dind IMAGE ID DISK USAGE CONTENT SIZE EXTRA dind:before 6f84404d1f9d 528MB 137MB dind:latest 5ac80767b941 436MB 112MB Signed-off-by: Tianon Gravi Signed-off-by: Sebastiaan van Stijn --- Dockerfile-dind.template | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 873144424..e0768d804 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -64,11 +64,17 @@ RUN set -eux; \ --no-same-owner \ # we exclude the CLI binary because we already extracted that over in the "docker:{{ env.version }}-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer --exclude 'docker/docker' \ +{{ if .version == "29.8.2" then "" else ( -}} +# exclude containerd, relying on the "embedded containerd" instead: https://github.com/moby/moby/pull/53388 (makes for a smaller image) + --exclude 'docker/containerd' \ +{{ ) end -}} ; \ rm docker.tgz; \ \ dockerd --version; \ +{{ if .version == "29.8.2" then ( -}} containerd --version; \ +{{ ) else "" end -}} ctr --version; \ runc --version From 461d9ad87ffca30f6034dcabbf26a5bd3c411ca8 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 1 Oct 2026 14:30:38 -0700 Subject: [PATCH 639/667] Update 29-rc to 29.9.0-rc.1, buildx 0.37.2, compose 5.5.1 --- 29-rc/cli/Dockerfile | 167 ++++++++++++ 29-rc/cli/docker-entrypoint.sh | 61 +++++ 29-rc/cli/modprobe.sh | 20 ++ 29-rc/dind-rootless/Dockerfile | 54 ++++ 29-rc/dind/Dockerfile | 104 ++++++++ 29-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 181 ++++++++++++- 9 files changed, 1006 insertions(+), 1 deletion(-) create mode 100644 29-rc/cli/Dockerfile create mode 100755 29-rc/cli/docker-entrypoint.sh create mode 100755 29-rc/cli/modprobe.sh create mode 100644 29-rc/dind-rootless/Dockerfile create mode 100644 29-rc/dind/Dockerfile create mode 100755 29-rc/dind/dockerd-entrypoint.sh create mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile new file mode 100644 index 000000000..1b4b85605 --- /dev/null +++ b/29-rc/cli/Dockerfile @@ -0,0 +1,167 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.24 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 29.9.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.37.2 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-amd64'; \ + sha256='982ca20490b45ed1ec8d99795974d3d874a358f75938c9c237305010e6b7e548'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v6'; \ + sha256='53a8d26bde4af99ce5123abec1d79f6c778cd22ad0c18bab1ae2056302b32805'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v7'; \ + sha256='82ce19352521eec762566346d48eb04f1f66ecf4fef6385fa903503c5530367a'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm64'; \ + sha256='efa38cb7aa7db2dbb9ad049b00b0a9737f66f033626177b5a4e845184ad7ab29'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-ppc64le'; \ + sha256='59b5565dba49775232e1c14f29342c1453ca40ee5edf57ca016a7ee123780afa'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-riscv64'; \ + sha256='0678850b5e49218e0c22990a1b9a9ea1e0835d92a89f01a21dc7e9c85033826b'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-s390x'; \ + sha256='1c43e151e84cf570a1124215ba15f92b6b240eac4c83115a94b8378b54409f3c'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 5.5.1 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64'; \ + sha256='db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6'; \ + sha256='421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7'; \ + sha256='32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64'; \ + sha256='732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le'; \ + sha256='1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64'; \ + sha256='d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x'; \ + sha256='58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/29-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/29-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..abea24b18 --- /dev/null +++ b/29-rc/dind-rootless/Dockerfile @@ -0,0 +1,54 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-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 +# slirp4netns is recommended as rootlesskit's net driver +# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.9.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.9.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile new file mode 100644 index 000000000..249abae7a --- /dev/null +++ b/29-rc/dind/Dockerfile @@ -0,0 +1,104 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-rc-cli + +# Runtime dependencies: +# - https://github.com/moby/moby/blob/864598f8c2677189e308eb4a3b3c0dd41fc06599/project/PACKAGERS.md#runtime-dependencies#runtime-dependencies +# - https://github.com/docker/packaging/blob/0ba325d178593583f190dc91566214a85c3880ad/pkg/docker-engine/deb/control#L24-L36 +RUN set -eux; \ + apk add --no-cache \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xz \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ +# exclude containerd, relying on the "embedded containerd" instead: https://github.com/moby/moby/pull/53388 (makes for a smaller image) + --exclude 'docker/containerd' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/docker/docker/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..77ff1aab3 --- /dev/null +++ b/29-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..c71e2d678 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.9.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.37.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.5.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..9a193a141 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.9.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.37.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.5.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 72fd020b5..0208a9b02 100644 --- a/versions.json +++ b/versions.json @@ -179,5 +179,184 @@ ], "version": "29.8.2" }, - "29-rc": null + "29-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.9.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.9.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.37.2.linux-amd64", + "sha256": "982ca20490b45ed1ec8d99795974d3d874a358f75938c9c237305010e6b7e548", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.37.2.linux-arm-v6", + "sha256": "53a8d26bde4af99ce5123abec1d79f6c778cd22ad0c18bab1ae2056302b32805", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.37.2.linux-arm-v7", + "sha256": "82ce19352521eec762566346d48eb04f1f66ecf4fef6385fa903503c5530367a", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.37.2.linux-arm64", + "sha256": "efa38cb7aa7db2dbb9ad049b00b0a9737f66f033626177b5a4e845184ad7ab29", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm64" + }, + "darwin-amd64": { + "file": "buildx-v0.37.2.darwin-amd64", + "sha256": "91cfde39945b0a76f0320db72d16f22ddf320da1d7a967b6871369041577cb88", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.darwin-amd64" + }, + "darwin-arm64v8": { + "file": "buildx-v0.37.2.darwin-arm64", + "sha256": "149e6a006edaa430f297b2bdcf65baaa6d7ee5ccfc7aa67dd50ce1c2b1db47e2", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.darwin-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.37.2.freebsd-amd64", + "sha256": "2d1f787da047520c11d6a76e8a200181e1f7793a12e9b2d5d4d5c1c7fdc66af0", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.37.2.freebsd-arm64", + "sha256": "c460c6bbba6907e13237fd96107c03702665303c03e9e9062af64a3dae09556e", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.37.2.netbsd-amd64", + "sha256": "18a4e9750d394f44c0d06385691ae25739802b2432e1eae7dc1b3b9e5550d37f", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.37.2.netbsd-arm64", + "sha256": "fbc072e03eace54b0e2ae0913a05fced7c0d345c442e8bfb981ee5a2ddfdd57a", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.37.2.openbsd-amd64", + "sha256": "dbb306b2742d9ce78d0d837a21ed05e64970891312cb03be48ad93eaad63bc94", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.37.2.openbsd-arm64", + "sha256": "abfa3d90949cef579531bb70a342271a31e8d23d68996993aa53a40c2eac8bc5", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.37.2.linux-ppc64le", + "sha256": "59b5565dba49775232e1c14f29342c1453ca40ee5edf57ca016a7ee123780afa", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.37.2.linux-riscv64", + "sha256": "0678850b5e49218e0c22990a1b9a9ea1e0835d92a89f01a21dc7e9c85033826b", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.37.2.linux-s390x", + "sha256": "1c43e151e84cf570a1124215ba15f92b6b240eac4c83115a94b8378b54409f3c", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.37.2.windows-amd64.exe", + "sha256": "39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.37.2.windows-arm64.exe", + "sha256": "43d910e930b1ebc3461a3e88750ac5bdc11bb97cf03f30ab77ad4b1c2c5990c3", + "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-arm64.exe" + } + }, + "version": "0.37.2" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "a264d61e824bf08a78867e59cdf32eb09f0aee9ecdf9f6ebfa43f76dc52880f1", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "998735c9b6fe68a4f05895e6ea73d71ad06f9fc7046383ad89e47346781b6af5", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "4bbb5d1ecc75bde1a9ca4afac43f5907c0d3bd0f88c7f00bf481ee7c8c1737be", + "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-aarch64.exe" + } + }, + "version": "5.5.1" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "29.9.0-rc.1" + } } From cdef894c37a7e2912441bd2fbcf6f6c738628559 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Oct 2026 15:04:18 -0700 Subject: [PATCH 640/667] Update 29 to compose 5.6.0 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 7b843503a..28675ccf7 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.5.1 +ENV DOCKER_COMPOSE_VERSION 5.6.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64'; \ - sha256='db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-x86_64'; \ + sha256='40343e21ca777173e69cff5dbafeb37c6f81f3b0d57d9e597f036e95eb63e76a'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6'; \ - sha256='421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv6'; \ + sha256='5531d2b21378cd0600d78c0ff44425fdcc2c0ba3b424a2e683004ff7987a4b53'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7'; \ - sha256='32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv7'; \ + sha256='7bce2792fb474aa3bbb67ee7060622eb0f66516c92083712bdec520127d4f105'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64'; \ - sha256='732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-aarch64'; \ + sha256='733ec76717ceb59052a9609b9dadfb523b2df8eab57a54212872d10a58078ea2'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le'; \ - sha256='1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-ppc64le'; \ + sha256='59893abdb92b6f23ed105f82472ba8df92e688916186b8622c4ebdf7abbf9984'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64'; \ - sha256='d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-riscv64'; \ + sha256='ea7702b8ac29d2b84bf05dc31727d5eceb3bd46f36ea30725b7532d4e3d8ae43'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x'; \ - sha256='58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-s390x'; \ + sha256='c1ed074ea3854870272a8d988e2f87ca7be0299aa51ad4ad024ef02cf5c273e1'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 2c37b8614..66be5c6d1 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.5.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f +ENV DOCKER_COMPOSE_VERSION 5.6.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 3249fe345..d2daa36b3 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.5.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f +ENV DOCKER_COMPOSE_VERSION 5.6.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 0208a9b02..488192009 100644 --- a/versions.json +++ b/versions.json @@ -113,61 +113,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64" + "sha256": "40343e21ca777173e69cff5dbafeb37c6f81f3b0d57d9e597f036e95eb63e76a", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6" + "sha256": "5531d2b21378cd0600d78c0ff44425fdcc2c0ba3b424a2e683004ff7987a4b53", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7" + "sha256": "7bce2792fb474aa3bbb67ee7060622eb0f66516c92083712bdec520127d4f105", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64" + "sha256": "733ec76717ceb59052a9609b9dadfb523b2df8eab57a54212872d10a58078ea2", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "a264d61e824bf08a78867e59cdf32eb09f0aee9ecdf9f6ebfa43f76dc52880f1", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-x86_64" + "sha256": "c76e3abf5fde1aeb3bd7c7306ff15bef2246afc1f9e54832a0a050dd7cdfb2f8", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "998735c9b6fe68a4f05895e6ea73d71ad06f9fc7046383ad89e47346781b6af5", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-aarch64" + "sha256": "bd714a42b46e51757fc1121085b3096b9064e3f80d3ca5a991e33f44df4f43c9", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le" + "sha256": "59893abdb92b6f23ed105f82472ba8df92e688916186b8622c4ebdf7abbf9984", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64" + "sha256": "ea7702b8ac29d2b84bf05dc31727d5eceb3bd46f36ea30725b7532d4e3d8ae43", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x" + "sha256": "c1ed074ea3854870272a8d988e2f87ca7be0299aa51ad4ad024ef02cf5c273e1", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe" + "sha256": "8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "4bbb5d1ecc75bde1a9ca4afac43f5907c0d3bd0f88c7f00bf481ee7c8c1737be", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-aarch64.exe" + "sha256": "73cdc73a03443cba37c7ae91aec12c7b86c0eb75a8f40f296aaa5159e66b29bc", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-aarch64.exe" } }, - "version": "5.5.1" + "version": "5.6.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 6d239f0f45cb1bd1606fc75458818bad8bca54c4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 2 Oct 2026 15:05:35 -0700 Subject: [PATCH 641/667] Update 29-rc to compose 5.6.0 --- 29-rc/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 1b4b85605..5576e8a5f 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.5.1 +ENV DOCKER_COMPOSE_VERSION 5.6.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64'; \ - sha256='db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-x86_64'; \ + sha256='40343e21ca777173e69cff5dbafeb37c6f81f3b0d57d9e597f036e95eb63e76a'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6'; \ - sha256='421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv6'; \ + sha256='5531d2b21378cd0600d78c0ff44425fdcc2c0ba3b424a2e683004ff7987a4b53'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7'; \ - sha256='32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv7'; \ + sha256='7bce2792fb474aa3bbb67ee7060622eb0f66516c92083712bdec520127d4f105'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64'; \ - sha256='732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-aarch64'; \ + sha256='733ec76717ceb59052a9609b9dadfb523b2df8eab57a54212872d10a58078ea2'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le'; \ - sha256='1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-ppc64le'; \ + sha256='59893abdb92b6f23ed105f82472ba8df92e688916186b8622c4ebdf7abbf9984'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64'; \ - sha256='d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-riscv64'; \ + sha256='ea7702b8ac29d2b84bf05dc31727d5eceb3bd46f36ea30725b7532d4e3d8ae43'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x'; \ - sha256='58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9'; \ + url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-s390x'; \ + sha256='c1ed074ea3854870272a8d988e2f87ca7be0299aa51ad4ad024ef02cf5c273e1'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index c71e2d678..117143b26 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.5.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f +ENV DOCKER_COMPOSE_VERSION 5.6.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 9a193a141..56e67e73c 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.5.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f +ENV DOCKER_COMPOSE_VERSION 5.6.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 488192009..4d5e334a4 100644 --- a/versions.json +++ b/versions.json @@ -293,61 +293,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "db1889184726840f75c4f9c001048430d4f25b3be3cb084d3ddd762bc0aed576", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-x86_64" + "sha256": "40343e21ca777173e69cff5dbafeb37c6f81f3b0d57d9e597f036e95eb63e76a", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "421ff5910b09cb30842bff39e920091f3cec8da662e449d3935eb2f9593f6d12", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv6" + "sha256": "5531d2b21378cd0600d78c0ff44425fdcc2c0ba3b424a2e683004ff7987a4b53", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "32e8e0182e7a94570ef60542e25346d465eaf5e2ca766d54bf9d64573ddaa52e", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-armv7" + "sha256": "7bce2792fb474aa3bbb67ee7060622eb0f66516c92083712bdec520127d4f105", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "732e3a84c1a0f67256ce80bc2598a24546b10ca05f9faa97efceb1171ece2ef7", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-aarch64" + "sha256": "733ec76717ceb59052a9609b9dadfb523b2df8eab57a54212872d10a58078ea2", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "a264d61e824bf08a78867e59cdf32eb09f0aee9ecdf9f6ebfa43f76dc52880f1", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-x86_64" + "sha256": "c76e3abf5fde1aeb3bd7c7306ff15bef2246afc1f9e54832a0a050dd7cdfb2f8", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "998735c9b6fe68a4f05895e6ea73d71ad06f9fc7046383ad89e47346781b6af5", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-darwin-aarch64" + "sha256": "bd714a42b46e51757fc1121085b3096b9064e3f80d3ca5a991e33f44df4f43c9", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "1f49f2a3bbcf68260378486877be23e53ac6ca5dc4c03087b675e63de6dfedfc", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-ppc64le" + "sha256": "59893abdb92b6f23ed105f82472ba8df92e688916186b8622c4ebdf7abbf9984", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "d7a2af7fa8d9396cc62bfedb73496f3008cc2f2a0d3c20b67e956f89d9477366", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-riscv64" + "sha256": "ea7702b8ac29d2b84bf05dc31727d5eceb3bd46f36ea30725b7532d4e3d8ae43", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "58c1395585a2a93ebf0b471c39cab597f46f4ce68884804a6d724431c85e82b9", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-linux-s390x" + "sha256": "c1ed074ea3854870272a8d988e2f87ca7be0299aa51ad4ad024ef02cf5c273e1", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "a3c0c73033eaede90210345d0cc2233edf4fab8fe0282a91dad8fd8436809d2f", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-x86_64.exe" + "sha256": "8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "4bbb5d1ecc75bde1a9ca4afac43f5907c0d3bd0f88c7f00bf481ee7c8c1737be", - "url": "https://github.com/docker/compose/releases/download/v5.5.1/docker-compose-windows-aarch64.exe" + "sha256": "73cdc73a03443cba37c7ae91aec12c7b86c0eb75a8f40f296aaa5159e66b29bc", + "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-aarch64.exe" } }, - "version": "5.5.1" + "version": "5.6.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From c464ff792e6a86bc7b3d4f509a6da66cdfeb7bfc Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 7 Oct 2026 15:04:19 -0700 Subject: [PATCH 642/667] Update 29-rc to 29.9.0-rc.2 --- 29-rc/cli/Dockerfile | 10 +++++----- 29-rc/dind-rootless/Dockerfile | 4 ++-- 29-rc/dind/Dockerfile | 8 ++++---- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- .../windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 5576e8a5f..3ebb7f47c 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.9.0-rc.1 +ENV DOCKER_VERSION 29.9.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile index abea24b18..b6a376401 100644 --- a/29-rc/dind-rootless/Dockerfile +++ b/29-rc/dind-rootless/Dockerfile @@ -26,10 +26,10 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.9.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.9.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.9.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.9.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile index 249abae7a..5917ebf60 100644 --- a/29-rc/dind/Dockerfile +++ b/29-rc/dind/Dockerfile @@ -56,16 +56,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 117143b26..628035ceb 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/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 29.9.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.1.zip +ENV DOCKER_VERSION 29.9.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.2.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/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 56e67e73c..170bafcf9 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/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 29.9.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.1.zip +ENV DOCKER_VERSION 29.9.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.2.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/versions.json b/versions.json index 4d5e334a4..85c187623 100644 --- a/versions.json +++ b/versions.json @@ -182,21 +182,21 @@ "29-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.9.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.9.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.9.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.9.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.2.zip" } }, "buildx": { @@ -357,6 +357,6 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.9.0-rc.1" + "version": "29.9.0-rc.2" } } From 2c72a21568154da929034f40194212f6b4e64bd6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 7 Oct 2026 21:04:12 -0700 Subject: [PATCH 643/667] Update 29 to buildx 0.38.0 --- 29/cli/Dockerfile | 30 ++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 104 +++++++++--------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 28675ccf7..b6dfbe2ee 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.37.2 +ENV DOCKER_BUILDX_VERSION 0.38.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-amd64'; \ - sha256='982ca20490b45ed1ec8d99795974d3d874a358f75938c9c237305010e6b7e548'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-amd64'; \ + sha256='4fe4cc38adf48169132749b6ca22a990928db0118e3407584ee553723115d287'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v6'; \ - sha256='53a8d26bde4af99ce5123abec1d79f6c778cd22ad0c18bab1ae2056302b32805'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v6'; \ + sha256='b4ac29bafc49598dbbb72c02fea69f4c89564cfd83de075ce591823d8ddd9a16'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v7'; \ - sha256='82ce19352521eec762566346d48eb04f1f66ecf4fef6385fa903503c5530367a'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v7'; \ + sha256='70e58bea42b5ecbda36aa3fa7328856e2478c34dada2787a6f44663c15421eb7'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm64'; \ - sha256='efa38cb7aa7db2dbb9ad049b00b0a9737f66f033626177b5a4e845184ad7ab29'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm64'; \ + sha256='38e890e1a162bfdbf32fbe91404991dc4fc28e55b0de901b34374a061bab4d2c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-ppc64le'; \ - sha256='59b5565dba49775232e1c14f29342c1453ca40ee5edf57ca016a7ee123780afa'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-ppc64le'; \ + sha256='252245e57c2648cabdfd4d2c5d21c03dfd039cad2ec2050435466c701b8dfed6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-riscv64'; \ - sha256='0678850b5e49218e0c22990a1b9a9ea1e0835d92a89f01a21dc7e9c85033826b'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-riscv64'; \ + sha256='b6fd16e37b3b370220ba0e616ba8013f45c915904249c0e2cb3ee9cfb6fc0868'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-s390x'; \ - sha256='1c43e151e84cf570a1124215ba15f92b6b240eac4c83115a94b8378b54409f3c'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-s390x'; \ + sha256='4c5c1de5059063e51c15c51cd87279aa2248ffbded7e16fe3086e83f3337037b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 66be5c6d1..2e29af867 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.37.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638 +ENV DOCKER_BUILDX_VERSION 0.38.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index d2daa36b3..e0b4cae90 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.37.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638 +ENV DOCKER_BUILDX_VERSION 0.38.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 85c187623..def1cec30 100644 --- a/versions.json +++ b/versions.json @@ -22,92 +22,92 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.37.2.linux-amd64", - "sha256": "982ca20490b45ed1ec8d99795974d3d874a358f75938c9c237305010e6b7e548", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-amd64" + "file": "buildx-v0.38.0.linux-amd64", + "sha256": "4fe4cc38adf48169132749b6ca22a990928db0118e3407584ee553723115d287", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.37.2.linux-arm-v6", - "sha256": "53a8d26bde4af99ce5123abec1d79f6c778cd22ad0c18bab1ae2056302b32805", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v6" + "file": "buildx-v0.38.0.linux-arm-v6", + "sha256": "b4ac29bafc49598dbbb72c02fea69f4c89564cfd83de075ce591823d8ddd9a16", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.37.2.linux-arm-v7", - "sha256": "82ce19352521eec762566346d48eb04f1f66ecf4fef6385fa903503c5530367a", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v7" + "file": "buildx-v0.38.0.linux-arm-v7", + "sha256": "70e58bea42b5ecbda36aa3fa7328856e2478c34dada2787a6f44663c15421eb7", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.37.2.linux-arm64", - "sha256": "efa38cb7aa7db2dbb9ad049b00b0a9737f66f033626177b5a4e845184ad7ab29", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm64" + "file": "buildx-v0.38.0.linux-arm64", + "sha256": "38e890e1a162bfdbf32fbe91404991dc4fc28e55b0de901b34374a061bab4d2c", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.37.2.darwin-amd64", - "sha256": "91cfde39945b0a76f0320db72d16f22ddf320da1d7a967b6871369041577cb88", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.darwin-amd64" + "file": "buildx-v0.38.0.darwin-amd64", + "sha256": "b123dc6fb51f88e47d37223938e2acd66edec73105459f65f19f15cc912ee559", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.37.2.darwin-arm64", - "sha256": "149e6a006edaa430f297b2bdcf65baaa6d7ee5ccfc7aa67dd50ce1c2b1db47e2", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.darwin-arm64" + "file": "buildx-v0.38.0.darwin-arm64", + "sha256": "85989b895add5f119c1ccf8eada2f6892fc33ccf16bd8917638eae404ef26344", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.37.2.freebsd-amd64", - "sha256": "2d1f787da047520c11d6a76e8a200181e1f7793a12e9b2d5d4d5c1c7fdc66af0", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.freebsd-amd64" + "file": "buildx-v0.38.0.freebsd-amd64", + "sha256": "b115fe8efc6da91ca3199f72247e9edeebc75b803dcc33c131ddc828df2139c4", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.37.2.freebsd-arm64", - "sha256": "c460c6bbba6907e13237fd96107c03702665303c03e9e9062af64a3dae09556e", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.freebsd-arm64" + "file": "buildx-v0.38.0.freebsd-arm64", + "sha256": "8cdc0e41ea2e1ef3c768d9e94715f9f955eaf9a1c6f7dae05f550f002da810e1", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.37.2.netbsd-amd64", - "sha256": "18a4e9750d394f44c0d06385691ae25739802b2432e1eae7dc1b3b9e5550d37f", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.netbsd-amd64" + "file": "buildx-v0.38.0.netbsd-amd64", + "sha256": "03809136136714a9c772a5befb4a34036e01d6385dba46910c58312c620aa3d6", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.37.2.netbsd-arm64", - "sha256": "fbc072e03eace54b0e2ae0913a05fced7c0d345c442e8bfb981ee5a2ddfdd57a", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.netbsd-arm64" + "file": "buildx-v0.38.0.netbsd-arm64", + "sha256": "3490cbf66f6a594d7e907ffb7f6113e899beb51c730ed6476171fd6d1431f293", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.37.2.openbsd-amd64", - "sha256": "dbb306b2742d9ce78d0d837a21ed05e64970891312cb03be48ad93eaad63bc94", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.openbsd-amd64" + "file": "buildx-v0.38.0.openbsd-amd64", + "sha256": "9c17cb56f3d5463d643d09c8aaaace265e1a2162a7bc7035cec4251c5917136c", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.37.2.openbsd-arm64", - "sha256": "abfa3d90949cef579531bb70a342271a31e8d23d68996993aa53a40c2eac8bc5", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.openbsd-arm64" + "file": "buildx-v0.38.0.openbsd-arm64", + "sha256": "f3ca8ead60ab5e17732ff9a5ae64b200ac4ff87eefcecd8956058dc6b63df276", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.37.2.linux-ppc64le", - "sha256": "59b5565dba49775232e1c14f29342c1453ca40ee5edf57ca016a7ee123780afa", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-ppc64le" + "file": "buildx-v0.38.0.linux-ppc64le", + "sha256": "252245e57c2648cabdfd4d2c5d21c03dfd039cad2ec2050435466c701b8dfed6", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.37.2.linux-riscv64", - "sha256": "0678850b5e49218e0c22990a1b9a9ea1e0835d92a89f01a21dc7e9c85033826b", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-riscv64" + "file": "buildx-v0.38.0.linux-riscv64", + "sha256": "b6fd16e37b3b370220ba0e616ba8013f45c915904249c0e2cb3ee9cfb6fc0868", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.37.2.linux-s390x", - "sha256": "1c43e151e84cf570a1124215ba15f92b6b240eac4c83115a94b8378b54409f3c", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-s390x" + "file": "buildx-v0.38.0.linux-s390x", + "sha256": "4c5c1de5059063e51c15c51cd87279aa2248ffbded7e16fe3086e83f3337037b", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.37.2.windows-amd64.exe", - "sha256": "39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe" + "file": "buildx-v0.38.0.windows-amd64.exe", + "sha256": "b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.37.2.windows-arm64.exe", - "sha256": "43d910e930b1ebc3461a3e88750ac5bdc11bb97cf03f30ab77ad4b1c2c5990c3", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-arm64.exe" + "file": "buildx-v0.38.0.windows-arm64.exe", + "sha256": "1be8e6d8ffe0eca91cf91a1ad020034a4d53358b5dffe5e3662c859c9be1745a", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-arm64.exe" } }, - "version": "0.37.2" + "version": "0.38.0" }, "compose": { "arches": { From 8f8abbd76c8a82fa2687b2df9d7bf00565a6eaf1 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 7 Oct 2026 21:05:49 -0700 Subject: [PATCH 644/667] Update 29-rc to buildx 0.38.0 --- 29-rc/cli/Dockerfile | 30 ++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 104 +++++++++--------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 3ebb7f47c..81b76e116 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.37.2 +ENV DOCKER_BUILDX_VERSION 0.38.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-amd64'; \ - sha256='982ca20490b45ed1ec8d99795974d3d874a358f75938c9c237305010e6b7e548'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-amd64'; \ + sha256='4fe4cc38adf48169132749b6ca22a990928db0118e3407584ee553723115d287'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v6'; \ - sha256='53a8d26bde4af99ce5123abec1d79f6c778cd22ad0c18bab1ae2056302b32805'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v6'; \ + sha256='b4ac29bafc49598dbbb72c02fea69f4c89564cfd83de075ce591823d8ddd9a16'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v7'; \ - sha256='82ce19352521eec762566346d48eb04f1f66ecf4fef6385fa903503c5530367a'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v7'; \ + sha256='70e58bea42b5ecbda36aa3fa7328856e2478c34dada2787a6f44663c15421eb7'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm64'; \ - sha256='efa38cb7aa7db2dbb9ad049b00b0a9737f66f033626177b5a4e845184ad7ab29'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm64'; \ + sha256='38e890e1a162bfdbf32fbe91404991dc4fc28e55b0de901b34374a061bab4d2c'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-ppc64le'; \ - sha256='59b5565dba49775232e1c14f29342c1453ca40ee5edf57ca016a7ee123780afa'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-ppc64le'; \ + sha256='252245e57c2648cabdfd4d2c5d21c03dfd039cad2ec2050435466c701b8dfed6'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-riscv64'; \ - sha256='0678850b5e49218e0c22990a1b9a9ea1e0835d92a89f01a21dc7e9c85033826b'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-riscv64'; \ + sha256='b6fd16e37b3b370220ba0e616ba8013f45c915904249c0e2cb3ee9cfb6fc0868'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-s390x'; \ - sha256='1c43e151e84cf570a1124215ba15f92b6b240eac4c83115a94b8378b54409f3c'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-s390x'; \ + sha256='4c5c1de5059063e51c15c51cd87279aa2248ffbded7e16fe3086e83f3337037b'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 628035ceb..762ef5546 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.37.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638 +ENV DOCKER_BUILDX_VERSION 0.38.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 170bafcf9..c84a52e31 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.37.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638 +ENV DOCKER_BUILDX_VERSION 0.38.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index def1cec30..679465702 100644 --- a/versions.json +++ b/versions.json @@ -202,92 +202,92 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.37.2.linux-amd64", - "sha256": "982ca20490b45ed1ec8d99795974d3d874a358f75938c9c237305010e6b7e548", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-amd64" + "file": "buildx-v0.38.0.linux-amd64", + "sha256": "4fe4cc38adf48169132749b6ca22a990928db0118e3407584ee553723115d287", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.37.2.linux-arm-v6", - "sha256": "53a8d26bde4af99ce5123abec1d79f6c778cd22ad0c18bab1ae2056302b32805", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v6" + "file": "buildx-v0.38.0.linux-arm-v6", + "sha256": "b4ac29bafc49598dbbb72c02fea69f4c89564cfd83de075ce591823d8ddd9a16", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.37.2.linux-arm-v7", - "sha256": "82ce19352521eec762566346d48eb04f1f66ecf4fef6385fa903503c5530367a", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm-v7" + "file": "buildx-v0.38.0.linux-arm-v7", + "sha256": "70e58bea42b5ecbda36aa3fa7328856e2478c34dada2787a6f44663c15421eb7", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.37.2.linux-arm64", - "sha256": "efa38cb7aa7db2dbb9ad049b00b0a9737f66f033626177b5a4e845184ad7ab29", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-arm64" + "file": "buildx-v0.38.0.linux-arm64", + "sha256": "38e890e1a162bfdbf32fbe91404991dc4fc28e55b0de901b34374a061bab4d2c", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.37.2.darwin-amd64", - "sha256": "91cfde39945b0a76f0320db72d16f22ddf320da1d7a967b6871369041577cb88", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.darwin-amd64" + "file": "buildx-v0.38.0.darwin-amd64", + "sha256": "b123dc6fb51f88e47d37223938e2acd66edec73105459f65f19f15cc912ee559", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.37.2.darwin-arm64", - "sha256": "149e6a006edaa430f297b2bdcf65baaa6d7ee5ccfc7aa67dd50ce1c2b1db47e2", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.darwin-arm64" + "file": "buildx-v0.38.0.darwin-arm64", + "sha256": "85989b895add5f119c1ccf8eada2f6892fc33ccf16bd8917638eae404ef26344", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.37.2.freebsd-amd64", - "sha256": "2d1f787da047520c11d6a76e8a200181e1f7793a12e9b2d5d4d5c1c7fdc66af0", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.freebsd-amd64" + "file": "buildx-v0.38.0.freebsd-amd64", + "sha256": "b115fe8efc6da91ca3199f72247e9edeebc75b803dcc33c131ddc828df2139c4", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.37.2.freebsd-arm64", - "sha256": "c460c6bbba6907e13237fd96107c03702665303c03e9e9062af64a3dae09556e", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.freebsd-arm64" + "file": "buildx-v0.38.0.freebsd-arm64", + "sha256": "8cdc0e41ea2e1ef3c768d9e94715f9f955eaf9a1c6f7dae05f550f002da810e1", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.37.2.netbsd-amd64", - "sha256": "18a4e9750d394f44c0d06385691ae25739802b2432e1eae7dc1b3b9e5550d37f", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.netbsd-amd64" + "file": "buildx-v0.38.0.netbsd-amd64", + "sha256": "03809136136714a9c772a5befb4a34036e01d6385dba46910c58312c620aa3d6", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.37.2.netbsd-arm64", - "sha256": "fbc072e03eace54b0e2ae0913a05fced7c0d345c442e8bfb981ee5a2ddfdd57a", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.netbsd-arm64" + "file": "buildx-v0.38.0.netbsd-arm64", + "sha256": "3490cbf66f6a594d7e907ffb7f6113e899beb51c730ed6476171fd6d1431f293", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.37.2.openbsd-amd64", - "sha256": "dbb306b2742d9ce78d0d837a21ed05e64970891312cb03be48ad93eaad63bc94", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.openbsd-amd64" + "file": "buildx-v0.38.0.openbsd-amd64", + "sha256": "9c17cb56f3d5463d643d09c8aaaace265e1a2162a7bc7035cec4251c5917136c", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.37.2.openbsd-arm64", - "sha256": "abfa3d90949cef579531bb70a342271a31e8d23d68996993aa53a40c2eac8bc5", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.openbsd-arm64" + "file": "buildx-v0.38.0.openbsd-arm64", + "sha256": "f3ca8ead60ab5e17732ff9a5ae64b200ac4ff87eefcecd8956058dc6b63df276", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.37.2.linux-ppc64le", - "sha256": "59b5565dba49775232e1c14f29342c1453ca40ee5edf57ca016a7ee123780afa", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-ppc64le" + "file": "buildx-v0.38.0.linux-ppc64le", + "sha256": "252245e57c2648cabdfd4d2c5d21c03dfd039cad2ec2050435466c701b8dfed6", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.37.2.linux-riscv64", - "sha256": "0678850b5e49218e0c22990a1b9a9ea1e0835d92a89f01a21dc7e9c85033826b", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-riscv64" + "file": "buildx-v0.38.0.linux-riscv64", + "sha256": "b6fd16e37b3b370220ba0e616ba8013f45c915904249c0e2cb3ee9cfb6fc0868", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.37.2.linux-s390x", - "sha256": "1c43e151e84cf570a1124215ba15f92b6b240eac4c83115a94b8378b54409f3c", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.linux-s390x" + "file": "buildx-v0.38.0.linux-s390x", + "sha256": "4c5c1de5059063e51c15c51cd87279aa2248ffbded7e16fe3086e83f3337037b", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.37.2.windows-amd64.exe", - "sha256": "39928ae02c2f4ba8b03ac84a51f3c966a8ffc7588f1f07a956c8620069408638", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-amd64.exe" + "file": "buildx-v0.38.0.windows-amd64.exe", + "sha256": "b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.37.2.windows-arm64.exe", - "sha256": "43d910e930b1ebc3461a3e88750ac5bdc11bb97cf03f30ab77ad4b1c2c5990c3", - "url": "https://github.com/docker/buildx/releases/download/v0.37.2/buildx-v0.37.2.windows-arm64.exe" + "file": "buildx-v0.38.0.windows-arm64.exe", + "sha256": "1be8e6d8ffe0eca91cf91a1ad020034a4d53358b5dffe5e3662c859c9be1745a", + "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-arm64.exe" } }, - "version": "0.37.2" + "version": "0.38.0" }, "compose": { "arches": { From 623f4fd9a5abae2e72bda5c5d983bf9ff04a5a62 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 8 Oct 2026 15:04:15 -0700 Subject: [PATCH 645/667] Update 29 to 29.9.0 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 11 ++++++----- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index b6dfbe2ee..058dcbfb5 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.8.2 +ENV DOCKER_VERSION 29.9.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.8.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.9.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 54b833747..1eb908fe9 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.8.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index b23dd6bc9..0ff722722 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -56,16 +56,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.8.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.0.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.8.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.9.0.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.8.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.0.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.8.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.0.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ @@ -79,11 +79,12 @@ RUN set -eux; \ --no-same-owner \ # we exclude the CLI binary because we already extracted that over in the "docker:29-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer --exclude 'docker/docker' \ +# exclude containerd, relying on the "embedded containerd" instead: https://github.com/moby/moby/pull/53388 (makes for a smaller image) + --exclude 'docker/containerd' \ ; \ rm docker.tgz; \ \ dockerd --version; \ - containerd --version; \ ctr --version; \ runc --version diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 2e29af867..2fe7c9d7e 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.8.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.2.zip +ENV DOCKER_VERSION 29.9.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.0.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index e0b4cae90..b0dbda3a6 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.8.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.8.2.zip +ENV DOCKER_VERSION 29.9.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.0.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/versions.json b/versions.json index 679465702..0bed6345c 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.8.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.8.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.9.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.8.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.9.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.8.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.9.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.8.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.8.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.9.0.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.8.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.9.0.zip" } }, "buildx": { @@ -177,7 +177,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.8.2" + "version": "29.9.0" }, "29-rc": { "arches": { From a0d707b3e17d6de77a6925f2584f415d53d6b939 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 8 Oct 2026 15:05:55 -0700 Subject: [PATCH 646/667] Update 29-rc --- 29-rc/cli/Dockerfile | 167 ------------ 29-rc/cli/docker-entrypoint.sh | 61 ----- 29-rc/cli/modprobe.sh | 20 -- 29-rc/dind-rootless/Dockerfile | 54 ---- 29-rc/dind/Dockerfile | 104 -------- 29-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 91 ------- .../windowsservercore-ltsc2025/Dockerfile | 91 ------- versions.json | 181 +------------ 9 files changed, 1 insertion(+), 1006 deletions(-) delete mode 100644 29-rc/cli/Dockerfile delete mode 100755 29-rc/cli/docker-entrypoint.sh delete mode 100755 29-rc/cli/modprobe.sh delete mode 100644 29-rc/dind-rootless/Dockerfile delete mode 100644 29-rc/dind/Dockerfile delete mode 100755 29-rc/dind/dockerd-entrypoint.sh delete mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile deleted file mode 100644 index 81b76e116..000000000 --- a/29-rc/cli/Dockerfile +++ /dev/null @@ -1,167 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.24 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 29.9.0-rc.2 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.38.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-amd64'; \ - sha256='4fe4cc38adf48169132749b6ca22a990928db0118e3407584ee553723115d287'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v6'; \ - sha256='b4ac29bafc49598dbbb72c02fea69f4c89564cfd83de075ce591823d8ddd9a16'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v7'; \ - sha256='70e58bea42b5ecbda36aa3fa7328856e2478c34dada2787a6f44663c15421eb7'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm64'; \ - sha256='38e890e1a162bfdbf32fbe91404991dc4fc28e55b0de901b34374a061bab4d2c'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-ppc64le'; \ - sha256='252245e57c2648cabdfd4d2c5d21c03dfd039cad2ec2050435466c701b8dfed6'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-riscv64'; \ - sha256='b6fd16e37b3b370220ba0e616ba8013f45c915904249c0e2cb3ee9cfb6fc0868'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-s390x'; \ - sha256='4c5c1de5059063e51c15c51cd87279aa2248ffbded7e16fe3086e83f3337037b'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 5.6.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-x86_64'; \ - sha256='40343e21ca777173e69cff5dbafeb37c6f81f3b0d57d9e597f036e95eb63e76a'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv6'; \ - sha256='5531d2b21378cd0600d78c0ff44425fdcc2c0ba3b424a2e683004ff7987a4b53'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv7'; \ - sha256='7bce2792fb474aa3bbb67ee7060622eb0f66516c92083712bdec520127d4f105'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-aarch64'; \ - sha256='733ec76717ceb59052a9609b9dadfb523b2df8eab57a54212872d10a58078ea2'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-ppc64le'; \ - sha256='59893abdb92b6f23ed105f82472ba8df92e688916186b8622c4ebdf7abbf9984'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-riscv64'; \ - sha256='ea7702b8ac29d2b84bf05dc31727d5eceb3bd46f36ea30725b7532d4e3d8ae43'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-s390x'; \ - sha256='c1ed074ea3854870272a8d988e2f87ca7be0299aa51ad4ad024ef02cf5c273e1'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/29-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/29-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile deleted file mode 100644 index b6a376401..000000000 --- a/29-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-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 -# slirp4netns is recommended as rootlesskit's net driver -# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.9.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.9.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile deleted file mode 100644 index 5917ebf60..000000000 --- a/29-rc/dind/Dockerfile +++ /dev/null @@ -1,104 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-rc-cli - -# Runtime dependencies: -# - https://github.com/moby/moby/blob/864598f8c2677189e308eb4a3b3c0dd41fc06599/project/PACKAGERS.md#runtime-dependencies#runtime-dependencies -# - https://github.com/docker/packaging/blob/0ba325d178593583f190dc91566214a85c3880ad/pkg/docker-engine/deb/control#L24-L36 -RUN set -eux; \ - apk add --no-cache \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xz \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.2.tgz'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.2.tgz'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.2.tgz'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.2.tgz'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ -# exclude containerd, relying on the "embedded containerd" instead: https://github.com/moby/moby/pull/53388 (makes for a smaller image) - --exclude 'docker/containerd' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/docker/docker/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 77ff1aab3..000000000 --- a/29-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 762ef5546..000000000 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.9.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.38.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.6.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index c84a52e31..000000000 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,91 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.9.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.2.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) - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.38.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.6.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 0bed6345c..54b7cfc9f 100644 --- a/versions.json +++ b/versions.json @@ -179,184 +179,5 @@ ], "version": "29.9.0" }, - "29-rc": { - "arches": { - "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.9.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.9.0-rc.2.tgz" - }, - "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.9.0-rc.2.tgz" - }, - "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.9.0-rc.2.tgz" - }, - "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.9.0-rc.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.9.0-rc.2.tgz" - }, - "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.9.0-rc.2.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.38.0.linux-amd64", - "sha256": "4fe4cc38adf48169132749b6ca22a990928db0118e3407584ee553723115d287", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.38.0.linux-arm-v6", - "sha256": "b4ac29bafc49598dbbb72c02fea69f4c89564cfd83de075ce591823d8ddd9a16", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.38.0.linux-arm-v7", - "sha256": "70e58bea42b5ecbda36aa3fa7328856e2478c34dada2787a6f44663c15421eb7", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.38.0.linux-arm64", - "sha256": "38e890e1a162bfdbf32fbe91404991dc4fc28e55b0de901b34374a061bab4d2c", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm64" - }, - "darwin-amd64": { - "file": "buildx-v0.38.0.darwin-amd64", - "sha256": "b123dc6fb51f88e47d37223938e2acd66edec73105459f65f19f15cc912ee559", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.darwin-amd64" - }, - "darwin-arm64v8": { - "file": "buildx-v0.38.0.darwin-arm64", - "sha256": "85989b895add5f119c1ccf8eada2f6892fc33ccf16bd8917638eae404ef26344", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.darwin-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.38.0.freebsd-amd64", - "sha256": "b115fe8efc6da91ca3199f72247e9edeebc75b803dcc33c131ddc828df2139c4", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.38.0.freebsd-arm64", - "sha256": "8cdc0e41ea2e1ef3c768d9e94715f9f955eaf9a1c6f7dae05f550f002da810e1", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.38.0.netbsd-amd64", - "sha256": "03809136136714a9c772a5befb4a34036e01d6385dba46910c58312c620aa3d6", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.38.0.netbsd-arm64", - "sha256": "3490cbf66f6a594d7e907ffb7f6113e899beb51c730ed6476171fd6d1431f293", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.38.0.openbsd-amd64", - "sha256": "9c17cb56f3d5463d643d09c8aaaace265e1a2162a7bc7035cec4251c5917136c", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.38.0.openbsd-arm64", - "sha256": "f3ca8ead60ab5e17732ff9a5ae64b200ac4ff87eefcecd8956058dc6b63df276", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.38.0.linux-ppc64le", - "sha256": "252245e57c2648cabdfd4d2c5d21c03dfd039cad2ec2050435466c701b8dfed6", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.38.0.linux-riscv64", - "sha256": "b6fd16e37b3b370220ba0e616ba8013f45c915904249c0e2cb3ee9cfb6fc0868", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.38.0.linux-s390x", - "sha256": "4c5c1de5059063e51c15c51cd87279aa2248ffbded7e16fe3086e83f3337037b", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.38.0.windows-amd64.exe", - "sha256": "b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.38.0.windows-arm64.exe", - "sha256": "1be8e6d8ffe0eca91cf91a1ad020034a4d53358b5dffe5e3662c859c9be1745a", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-arm64.exe" - } - }, - "version": "0.38.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "40343e21ca777173e69cff5dbafeb37c6f81f3b0d57d9e597f036e95eb63e76a", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "5531d2b21378cd0600d78c0ff44425fdcc2c0ba3b424a2e683004ff7987a4b53", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "7bce2792fb474aa3bbb67ee7060622eb0f66516c92083712bdec520127d4f105", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "733ec76717ceb59052a9609b9dadfb523b2df8eab57a54212872d10a58078ea2", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "c76e3abf5fde1aeb3bd7c7306ff15bef2246afc1f9e54832a0a050dd7cdfb2f8", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "bd714a42b46e51757fc1121085b3096b9064e3f80d3ca5a991e33f44df4f43c9", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "59893abdb92b6f23ed105f82472ba8df92e688916186b8622c4ebdf7abbf9984", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "ea7702b8ac29d2b84bf05dc31727d5eceb3bd46f36ea30725b7532d4e3d8ae43", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "c1ed074ea3854870272a8d988e2f87ca7be0299aa51ad4ad024ef02cf5c273e1", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "73cdc73a03443cba37c7ae91aec12c7b86c0eb75a8f40f296aaa5159e66b29bc", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-aarch64.exe" - } - }, - "version": "5.6.0" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "29.9.0-rc.2" - } + "29-rc": null } From 60a6918b24ba2972a786f595e19755b7effcad15 Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Fri, 9 Oct 2026 01:09:58 +0200 Subject: [PATCH 647/667] Avoid noisy procfs errors in iptables detection (#589) Some optional /proc/net/*_tables_names files are absent when using the nftables backend. Check readability before calling cat so the expected absence does not produce misleading stderr output during normal DinD startup. --- 29/dind/dockerd-entrypoint.sh | 2 +- dockerd-entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/29/dind/dockerd-entrypoint.sh b/29/dind/dockerd-entrypoint.sh index 77ff1aab3..130883d69 100755 --- a/29/dind/dockerd-entrypoint.sh +++ b/29/dind/dockerd-entrypoint.sh @@ -161,7 +161,7 @@ if [ "$1" = 'dockerd' ]; then # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then + if [ -r "$f" ] && b="$(cat "$f")" && [ -n "$b" ]; then exit 0 fi done diff --git a/dockerd-entrypoint.sh b/dockerd-entrypoint.sh index 77ff1aab3..130883d69 100755 --- a/dockerd-entrypoint.sh +++ b/dockerd-entrypoint.sh @@ -161,7 +161,7 @@ if [ "$1" = 'dockerd' ]; then # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if b="$(cat "$f")" && [ -n "$b" ]; then + if [ -r "$f" ] && b="$(cat "$f")" && [ -n "$b" ]; then exit 0 fi done From 44e73870094c4f9df2cd9958c2f26e78c076b1d2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 14 Oct 2026 15:04:15 -0700 Subject: [PATCH 648/667] Update 29 to 29.9.1 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 058dcbfb5..4505e6a53 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.9.0 +ENV DOCKER_VERSION 29.9.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.9.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.9.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 1eb908fe9..44312ef97 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.9.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 0ff722722..ff5323c3c 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -56,16 +56,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.1.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.9.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.9.1.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.1.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.0.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.1.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 2fe7c9d7e..d105442d5 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.9.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.0.zip +ENV DOCKER_VERSION 29.9.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.1.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index b0dbda3a6..b20e0badc 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.9.0 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.0.zip +ENV DOCKER_VERSION 29.9.1 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.1.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/versions.json b/versions.json index 54b7cfc9f..d0f22dd4e 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.9.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.9.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.1.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.9.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.9.1.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.9.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.9.1.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.9.0.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.0.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.9.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.1.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.9.0.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.9.1.zip" } }, "buildx": { @@ -177,7 +177,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.9.0" + "version": "29.9.1" }, "29-rc": null } From 29938079fb10e4c1a5e417cf74a84b6f845443e2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 20 Oct 2026 15:04:13 -0700 Subject: [PATCH 649/667] Update 29 to 29.9.2 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 4505e6a53..8a218cce6 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.9.1 +ENV DOCKER_VERSION 29.9.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.9.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.9.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 44312ef97..5210381e9 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.9.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index ff5323c3c..155b93795 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -56,16 +56,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.9.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.9.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.1.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index d105442d5..8df60d6bc 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.9.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.1.zip +ENV DOCKER_VERSION 29.9.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.2.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index b20e0badc..0f3793203 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.9.1 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.1.zip +ENV DOCKER_VERSION 29.9.2 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.2.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/versions.json b/versions.json index d0f22dd4e..ef6a9f6fc 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.9.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.9.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.9.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.9.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.9.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.9.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.9.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.9.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.9.1.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.9.2.zip" } }, "buildx": { @@ -177,7 +177,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.9.1" + "version": "29.9.2" }, "29-rc": null } From aa257aa3a4f75675dafd4a05a33a5381e62a29ae Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 20 Oct 2026 21:04:25 -0700 Subject: [PATCH 650/667] Update 29 to buildx 0.38.1 --- 29/cli/Dockerfile | 30 ++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 104 +++++++++--------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 8a218cce6..05ecb5179 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.38.0 +ENV DOCKER_BUILDX_VERSION 0.38.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-amd64'; \ - sha256='4fe4cc38adf48169132749b6ca22a990928db0118e3407584ee553723115d287'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-amd64'; \ + sha256='e25d5cd675092bb5d1d03632fdc46cdf3fede7b514dc5f023a105e00d3ce5ad4'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v6'; \ - sha256='b4ac29bafc49598dbbb72c02fea69f4c89564cfd83de075ce591823d8ddd9a16'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm-v6'; \ + sha256='a1d906b59689858d11e951701b2ce8fc76215d22df416f00e65da5b86be908b8'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v7'; \ - sha256='70e58bea42b5ecbda36aa3fa7328856e2478c34dada2787a6f44663c15421eb7'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm-v7'; \ + sha256='9b7cbbf641caedc5fed87d1132aa4be45c74cfd6c502af48a9286e64b5f9e704'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm64'; \ - sha256='38e890e1a162bfdbf32fbe91404991dc4fc28e55b0de901b34374a061bab4d2c'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm64'; \ + sha256='3b83b3731916ba433feccaaa689fe5bcdc81c641d92c8e6c2ea865dfa141c97a'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-ppc64le'; \ - sha256='252245e57c2648cabdfd4d2c5d21c03dfd039cad2ec2050435466c701b8dfed6'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-ppc64le'; \ + sha256='7f1fdd2c9b81513b2feab5c8222842bae80cd4b919facadbc2bf485d3b0708fd'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-riscv64'; \ - sha256='b6fd16e37b3b370220ba0e616ba8013f45c915904249c0e2cb3ee9cfb6fc0868'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-riscv64'; \ + sha256='a5fc405944c4aaa4bb69d5f40c830de4d52dd84230841f46939603c84edb3ff3'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-s390x'; \ - sha256='4c5c1de5059063e51c15c51cd87279aa2248ffbded7e16fe3086e83f3337037b'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-s390x'; \ + sha256='154b7faa9ecc6fceac2f486928815124bd794f25b3aceb7c15c51687be274204'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 8df60d6bc..6725549e5 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.38.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26 +ENV DOCKER_BUILDX_VERSION 0.38.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 fd2e18501910dd535ea3aa7f69010b3cfdfba0f47aa27674124554386dfa26f3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 0f3793203..40f1737f9 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.38.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26 +ENV DOCKER_BUILDX_VERSION 0.38.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 fd2e18501910dd535ea3aa7f69010b3cfdfba0f47aa27674124554386dfa26f3 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index ef6a9f6fc..b13881e37 100644 --- a/versions.json +++ b/versions.json @@ -22,92 +22,92 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.38.0.linux-amd64", - "sha256": "4fe4cc38adf48169132749b6ca22a990928db0118e3407584ee553723115d287", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-amd64" + "file": "buildx-v0.38.1.linux-amd64", + "sha256": "e25d5cd675092bb5d1d03632fdc46cdf3fede7b514dc5f023a105e00d3ce5ad4", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.38.0.linux-arm-v6", - "sha256": "b4ac29bafc49598dbbb72c02fea69f4c89564cfd83de075ce591823d8ddd9a16", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v6" + "file": "buildx-v0.38.1.linux-arm-v6", + "sha256": "a1d906b59689858d11e951701b2ce8fc76215d22df416f00e65da5b86be908b8", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.38.0.linux-arm-v7", - "sha256": "70e58bea42b5ecbda36aa3fa7328856e2478c34dada2787a6f44663c15421eb7", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm-v7" + "file": "buildx-v0.38.1.linux-arm-v7", + "sha256": "9b7cbbf641caedc5fed87d1132aa4be45c74cfd6c502af48a9286e64b5f9e704", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.38.0.linux-arm64", - "sha256": "38e890e1a162bfdbf32fbe91404991dc4fc28e55b0de901b34374a061bab4d2c", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-arm64" + "file": "buildx-v0.38.1.linux-arm64", + "sha256": "3b83b3731916ba433feccaaa689fe5bcdc81c641d92c8e6c2ea865dfa141c97a", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.38.0.darwin-amd64", - "sha256": "b123dc6fb51f88e47d37223938e2acd66edec73105459f65f19f15cc912ee559", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.darwin-amd64" + "file": "buildx-v0.38.1.darwin-amd64", + "sha256": "76e7a809cc98d34a4c1b7db23feac673def5b8dcdddd9e713ef26598689aa796", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.38.0.darwin-arm64", - "sha256": "85989b895add5f119c1ccf8eada2f6892fc33ccf16bd8917638eae404ef26344", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.darwin-arm64" + "file": "buildx-v0.38.1.darwin-arm64", + "sha256": "6f20ba2437865311ef99015bf5d1039c3c8e4d2177c1c64aa41b134b5ecd3012", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.38.0.freebsd-amd64", - "sha256": "b115fe8efc6da91ca3199f72247e9edeebc75b803dcc33c131ddc828df2139c4", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.freebsd-amd64" + "file": "buildx-v0.38.1.freebsd-amd64", + "sha256": "478a37dfacf33adc58c0359932b7d077dadb68b3c4e827ff65716d3f8fa466aa", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.38.0.freebsd-arm64", - "sha256": "8cdc0e41ea2e1ef3c768d9e94715f9f955eaf9a1c6f7dae05f550f002da810e1", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.freebsd-arm64" + "file": "buildx-v0.38.1.freebsd-arm64", + "sha256": "ef1e2d89ca528dde4e1ab4a3bd9661fe4c4219d960f4c166d79e5e3b9c34e8ce", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.38.0.netbsd-amd64", - "sha256": "03809136136714a9c772a5befb4a34036e01d6385dba46910c58312c620aa3d6", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.netbsd-amd64" + "file": "buildx-v0.38.1.netbsd-amd64", + "sha256": "b0cf8a7de4ab0eaa3b8f71d7833a93e19053580ef1691182c68781bb0a0562e6", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.38.0.netbsd-arm64", - "sha256": "3490cbf66f6a594d7e907ffb7f6113e899beb51c730ed6476171fd6d1431f293", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.netbsd-arm64" + "file": "buildx-v0.38.1.netbsd-arm64", + "sha256": "748df205e7efa8a1756a403a5f64619c02052ba4bdac12b80d60a79469609c03", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.38.0.openbsd-amd64", - "sha256": "9c17cb56f3d5463d643d09c8aaaace265e1a2162a7bc7035cec4251c5917136c", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.openbsd-amd64" + "file": "buildx-v0.38.1.openbsd-amd64", + "sha256": "664af842d593f6ecadaec0faa69c51991a81ef15ee9bbb38e436e3665f1a6452", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.38.0.openbsd-arm64", - "sha256": "f3ca8ead60ab5e17732ff9a5ae64b200ac4ff87eefcecd8956058dc6b63df276", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.openbsd-arm64" + "file": "buildx-v0.38.1.openbsd-arm64", + "sha256": "714b304c105a720dbd0f3eefcf7fc0fb90885a48807418c9a57a83661b9f251f", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.38.0.linux-ppc64le", - "sha256": "252245e57c2648cabdfd4d2c5d21c03dfd039cad2ec2050435466c701b8dfed6", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-ppc64le" + "file": "buildx-v0.38.1.linux-ppc64le", + "sha256": "7f1fdd2c9b81513b2feab5c8222842bae80cd4b919facadbc2bf485d3b0708fd", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.38.0.linux-riscv64", - "sha256": "b6fd16e37b3b370220ba0e616ba8013f45c915904249c0e2cb3ee9cfb6fc0868", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-riscv64" + "file": "buildx-v0.38.1.linux-riscv64", + "sha256": "a5fc405944c4aaa4bb69d5f40c830de4d52dd84230841f46939603c84edb3ff3", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.38.0.linux-s390x", - "sha256": "4c5c1de5059063e51c15c51cd87279aa2248ffbded7e16fe3086e83f3337037b", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.linux-s390x" + "file": "buildx-v0.38.1.linux-s390x", + "sha256": "154b7faa9ecc6fceac2f486928815124bd794f25b3aceb7c15c51687be274204", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.38.0.windows-amd64.exe", - "sha256": "b39784aed5b3f9b24d1971bbcbad8c8206033fa63ed4fea82c9141728fe0ea26", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-amd64.exe" + "file": "buildx-v0.38.1.windows-amd64.exe", + "sha256": "fd2e18501910dd535ea3aa7f69010b3cfdfba0f47aa27674124554386dfa26f3", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.38.0.windows-arm64.exe", - "sha256": "1be8e6d8ffe0eca91cf91a1ad020034a4d53358b5dffe5e3662c859c9be1745a", - "url": "https://github.com/docker/buildx/releases/download/v0.38.0/buildx-v0.38.0.windows-arm64.exe" + "file": "buildx-v0.38.1.windows-arm64.exe", + "sha256": "2d4e2e78d7ddf0ea6d63acde7e73599717e94e3f9417edd23d4ffeceef6777fc", + "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.windows-arm64.exe" } }, - "version": "0.38.0" + "version": "0.38.1" }, "compose": { "arches": { From a44773e1e79648f9fd7ebb7cb5cc00387dc05de0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 21 Oct 2026 03:04:14 -0700 Subject: [PATCH 651/667] Update 29 to compose 5.6.1 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 05ecb5179..b215c267e 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.6.0 +ENV DOCKER_COMPOSE_VERSION 5.6.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-x86_64'; \ - sha256='40343e21ca777173e69cff5dbafeb37c6f81f3b0d57d9e597f036e95eb63e76a'; \ + url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-x86_64'; \ + sha256='47737f4236e6d3ccea7291995203f8f018058783b4c3a9469119811a0b5db8c0'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv6'; \ - sha256='5531d2b21378cd0600d78c0ff44425fdcc2c0ba3b424a2e683004ff7987a4b53'; \ + url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-armv6'; \ + sha256='bf1573bca672a535409fca7d6a53d836554fd90b76c27e0c3830a8a431517ecd'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv7'; \ - sha256='7bce2792fb474aa3bbb67ee7060622eb0f66516c92083712bdec520127d4f105'; \ + url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-armv7'; \ + sha256='e2ed79b41693f5e6473eb9c1005bd4cbb83844d8220ac72fe5c6a6cc5e0bfee8'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-aarch64'; \ - sha256='733ec76717ceb59052a9609b9dadfb523b2df8eab57a54212872d10a58078ea2'; \ + url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-aarch64'; \ + sha256='42cfa75f51ad0ccf290bad37899e0038a8c10a0069e85233ecc1d53e3ff1347d'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-ppc64le'; \ - sha256='59893abdb92b6f23ed105f82472ba8df92e688916186b8622c4ebdf7abbf9984'; \ + url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-ppc64le'; \ + sha256='2af4a1b5890fcf4830029d85c01d94ca7b8add96edc5b32bf8d598438be75840'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-riscv64'; \ - sha256='ea7702b8ac29d2b84bf05dc31727d5eceb3bd46f36ea30725b7532d4e3d8ae43'; \ + url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-riscv64'; \ + sha256='e9af542c3a5ee961130c316b9a43b08e359503ab0efebf50980e57d92bd883fc'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-s390x'; \ - sha256='c1ed074ea3854870272a8d988e2f87ca7be0299aa51ad4ad024ef02cf5c273e1'; \ + url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-s390x'; \ + sha256='b91bf1ab1a15d7e7863002a796e7a41937e5fb77b9e4826e7a38d7216958d850'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 6725549e5..166237f4d 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.6.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483 +ENV DOCKER_COMPOSE_VERSION 5.6.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 91b1492f0a923427651e2b955739d732ac36b8191193bf4799e62f3e3525c4cd RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 40f1737f9..fe7d54a8c 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.6.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483 +ENV DOCKER_COMPOSE_VERSION 5.6.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 91b1492f0a923427651e2b955739d732ac36b8191193bf4799e62f3e3525c4cd RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b13881e37..b84f292dc 100644 --- a/versions.json +++ b/versions.json @@ -113,61 +113,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "40343e21ca777173e69cff5dbafeb37c6f81f3b0d57d9e597f036e95eb63e76a", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-x86_64" + "sha256": "47737f4236e6d3ccea7291995203f8f018058783b4c3a9469119811a0b5db8c0", + "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "5531d2b21378cd0600d78c0ff44425fdcc2c0ba3b424a2e683004ff7987a4b53", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv6" + "sha256": "bf1573bca672a535409fca7d6a53d836554fd90b76c27e0c3830a8a431517ecd", + "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "7bce2792fb474aa3bbb67ee7060622eb0f66516c92083712bdec520127d4f105", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-armv7" + "sha256": "e2ed79b41693f5e6473eb9c1005bd4cbb83844d8220ac72fe5c6a6cc5e0bfee8", + "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "733ec76717ceb59052a9609b9dadfb523b2df8eab57a54212872d10a58078ea2", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-aarch64" + "sha256": "42cfa75f51ad0ccf290bad37899e0038a8c10a0069e85233ecc1d53e3ff1347d", + "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c76e3abf5fde1aeb3bd7c7306ff15bef2246afc1f9e54832a0a050dd7cdfb2f8", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-darwin-x86_64" + "sha256": "245c191b11a6345dd3b32b8f6eadeed1e1dcd5147aa46dfa423462e95f587e93", + "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "bd714a42b46e51757fc1121085b3096b9064e3f80d3ca5a991e33f44df4f43c9", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-darwin-aarch64" + "sha256": "fcce41226abd2b7b2936094e688bbd61284673dddafea542e08cb9a3b4423a8b", + "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "59893abdb92b6f23ed105f82472ba8df92e688916186b8622c4ebdf7abbf9984", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-ppc64le" + "sha256": "2af4a1b5890fcf4830029d85c01d94ca7b8add96edc5b32bf8d598438be75840", + "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "ea7702b8ac29d2b84bf05dc31727d5eceb3bd46f36ea30725b7532d4e3d8ae43", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-riscv64" + "sha256": "e9af542c3a5ee961130c316b9a43b08e359503ab0efebf50980e57d92bd883fc", + "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "c1ed074ea3854870272a8d988e2f87ca7be0299aa51ad4ad024ef02cf5c273e1", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-linux-s390x" + "sha256": "b91bf1ab1a15d7e7863002a796e7a41937e5fb77b9e4826e7a38d7216958d850", + "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "8aeaa0055e660e12cf07cd70680dc8333957fe6718528b91ec3da084eab62483", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-x86_64.exe" + "sha256": "91b1492f0a923427651e2b955739d732ac36b8191193bf4799e62f3e3525c4cd", + "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "73cdc73a03443cba37c7ae91aec12c7b86c0eb75a8f40f296aaa5159e66b29bc", - "url": "https://github.com/docker/compose/releases/download/v5.6.0/docker-compose-windows-aarch64.exe" + "sha256": "2a8ab89b27a7ba79c3ec5b3eb59e099b39990d2c7ea47fc38433fc24812ad266", + "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-windows-aarch64.exe" } }, - "version": "5.6.0" + "version": "5.6.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 21c9665d5c333b4811449c1ac7331579c4f526d9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 30 Oct 2026 23:46:02 +0100 Subject: [PATCH 652/667] update docker/docker github URLs to moby/moby (#590) The github.com/docker/docker repository was renamed to github.com/moby/moby. Update the URLs so that we don't have to depend on GitHub's redirects for the old location. Signed-off-by: Sebastiaan van Stijn --- 29/dind/Dockerfile | 4 ++-- Dockerfile-dind.template | 4 ++-- versions.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 155b93795..978e3851f 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -88,11 +88,11 @@ RUN set -eux; \ ctr --version; \ runc --version -# https://github.com/docker/docker/tree/master/hack/dind +# https://github.com/moby/moby/tree/master/hack/dind ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/moby/moby/${DIND_COMMIT}/hack/dind"; \ chmod +x /usr/local/bin/dind COPY dockerd-entrypoint.sh /usr/local/bin/ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index e0768d804..446c03414 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -78,11 +78,11 @@ RUN set -eux; \ ctr --version; \ runc --version -# https://github.com/docker/docker/tree/master/hack/dind +# https://github.com/moby/moby/tree/master/hack/dind ENV DIND_COMMIT {{ .dindCommit }} RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind"; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/moby/moby/${DIND_COMMIT}/hack/dind"; \ chmod +x /usr/local/bin/dind COPY dockerd-entrypoint.sh /usr/local/bin/ diff --git a/versions.sh b/versions.sh index 7693592cb..e67957bb8 100755 --- a/versions.sh +++ b/versions.sh @@ -39,12 +39,12 @@ _curl() { } dindLatest="$( - _curl -H 'Accept: application/json' 'https://github.com/docker/docker/commits/master/hack/dind.atom' \ + _curl -H 'Accept: application/json' 'https://github.com/moby/moby/commits/master/hack/dind.atom' \ | jq -r '.payload | first(.. | .commits?[]?.oid)' )" dockerVersions="$( - git ls-remote --tags https://github.com/docker/docker.git \ + git ls-remote --tags https://github.com/moby/moby.git \ | jq --raw-input --null-input --raw-output ' [ inputs | capture("refs/tags/(docker-)?v(?[0-9.a-z-]+)($|\\^)") | .version ] | unique_by( split(".") | map(tonumber? // .) ) From 43c7841cf46cdf61260dbd608f1ef4f53e18a58c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 2 Nov 2026 08:04:28 -0800 Subject: [PATCH 653/667] Update 29 to compose 5.7.0 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index b215c267e..f06d40604 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.6.1 +ENV DOCKER_COMPOSE_VERSION 5.7.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-x86_64'; \ - sha256='47737f4236e6d3ccea7291995203f8f018058783b4c3a9469119811a0b5db8c0'; \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-x86_64'; \ + sha256='7758048ad38e580f22559603312874fec8bb638d021a9e64182385fc17cc12a2'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-armv6'; \ - sha256='bf1573bca672a535409fca7d6a53d836554fd90b76c27e0c3830a8a431517ecd'; \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv6'; \ + sha256='1d6589e2a9d6c6d5ad8e53491ea9e07cb8be45d6cbd44ba5575f38ada2dd5998'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-armv7'; \ - sha256='e2ed79b41693f5e6473eb9c1005bd4cbb83844d8220ac72fe5c6a6cc5e0bfee8'; \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv7'; \ + sha256='d18e5c549fd3595b36846fe00d01e2af5a37d4baec7945c557a0abda9af63c91'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-aarch64'; \ - sha256='42cfa75f51ad0ccf290bad37899e0038a8c10a0069e85233ecc1d53e3ff1347d'; \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-aarch64'; \ + sha256='15861535d14e26555736b49376c95e14bfd94285366c8446bfac7156a972e76f'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-ppc64le'; \ - sha256='2af4a1b5890fcf4830029d85c01d94ca7b8add96edc5b32bf8d598438be75840'; \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-ppc64le'; \ + sha256='2f47de2439791611614ca3d23c1c4daf76f3842f2dca7d0b21c20cb1abb09557'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-riscv64'; \ - sha256='e9af542c3a5ee961130c316b9a43b08e359503ab0efebf50980e57d92bd883fc'; \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-riscv64'; \ + sha256='0d069b424e703d1e7e79bc1cba46b6e51c0d915847ba88612add8117bf4239ed'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-s390x'; \ - sha256='b91bf1ab1a15d7e7863002a796e7a41937e5fb77b9e4826e7a38d7216958d850'; \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-s390x'; \ + sha256='8d7b4b5e61a7659d14a5cc2d16c6e2119b7113af1858b4879a7463707eee24ca'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 166237f4d..42462decd 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.6.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 91b1492f0a923427651e2b955739d732ac36b8191193bf4799e62f3e3525c4cd +ENV DOCKER_COMPOSE_VERSION 5.7.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index fe7d54a8c..50c66a2e0 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.6.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 91b1492f0a923427651e2b955739d732ac36b8191193bf4799e62f3e3525c4cd +ENV DOCKER_COMPOSE_VERSION 5.7.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index b84f292dc..7500bede2 100644 --- a/versions.json +++ b/versions.json @@ -113,61 +113,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "47737f4236e6d3ccea7291995203f8f018058783b4c3a9469119811a0b5db8c0", - "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-x86_64" + "sha256": "7758048ad38e580f22559603312874fec8bb638d021a9e64182385fc17cc12a2", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "bf1573bca672a535409fca7d6a53d836554fd90b76c27e0c3830a8a431517ecd", - "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-armv6" + "sha256": "1d6589e2a9d6c6d5ad8e53491ea9e07cb8be45d6cbd44ba5575f38ada2dd5998", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "e2ed79b41693f5e6473eb9c1005bd4cbb83844d8220ac72fe5c6a6cc5e0bfee8", - "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-armv7" + "sha256": "d18e5c549fd3595b36846fe00d01e2af5a37d4baec7945c557a0abda9af63c91", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "42cfa75f51ad0ccf290bad37899e0038a8c10a0069e85233ecc1d53e3ff1347d", - "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-aarch64" + "sha256": "15861535d14e26555736b49376c95e14bfd94285366c8446bfac7156a972e76f", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "245c191b11a6345dd3b32b8f6eadeed1e1dcd5147aa46dfa423462e95f587e93", - "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-darwin-x86_64" + "sha256": "f57fad1fc3a942309b76da99e0a1c49dc97f7c56d4a03593d71bb01577aeeb29", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "fcce41226abd2b7b2936094e688bbd61284673dddafea542e08cb9a3b4423a8b", - "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-darwin-aarch64" + "sha256": "54495ff81dd8cae11861455f0308a293a530149beba8f1d90ff3f295b11cf035", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "2af4a1b5890fcf4830029d85c01d94ca7b8add96edc5b32bf8d598438be75840", - "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-ppc64le" + "sha256": "2f47de2439791611614ca3d23c1c4daf76f3842f2dca7d0b21c20cb1abb09557", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "e9af542c3a5ee961130c316b9a43b08e359503ab0efebf50980e57d92bd883fc", - "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-riscv64" + "sha256": "0d069b424e703d1e7e79bc1cba46b6e51c0d915847ba88612add8117bf4239ed", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "b91bf1ab1a15d7e7863002a796e7a41937e5fb77b9e4826e7a38d7216958d850", - "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-linux-s390x" + "sha256": "8d7b4b5e61a7659d14a5cc2d16c6e2119b7113af1858b4879a7463707eee24ca", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "91b1492f0a923427651e2b955739d732ac36b8191193bf4799e62f3e3525c4cd", - "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-windows-x86_64.exe" + "sha256": "f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "2a8ab89b27a7ba79c3ec5b3eb59e099b39990d2c7ea47fc38433fc24812ad266", - "url": "https://github.com/docker/compose/releases/download/v5.6.1/docker-compose-windows-aarch64.exe" + "sha256": "d622f50e48d0565c1d3ab8c410ef7287a9efe0cf2b2c803ff7878918592e27bf", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-aarch64.exe" } }, - "version": "5.6.1" + "version": "5.7.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From ebbde6d5851f7abea8d4a6fb7876d656bb36385c Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 3 Nov 2026 08:04:14 -0800 Subject: [PATCH 654/667] Update 29 to buildx 0.38.2 --- 29/cli/Dockerfile | 30 ++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 104 +++++++++--------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index f06d40604..6aac6351f 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.38.1 +ENV DOCKER_BUILDX_VERSION 0.38.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-amd64'; \ - sha256='e25d5cd675092bb5d1d03632fdc46cdf3fede7b514dc5f023a105e00d3ce5ad4'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-amd64'; \ + sha256='7992ec09413b80ff57ba4e081f56fc833d7bac1d5e71143c6c809e7e6065f6d6'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm-v6'; \ - sha256='a1d906b59689858d11e951701b2ce8fc76215d22df416f00e65da5b86be908b8'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v6'; \ + sha256='47c3eba42d0c55c5843193b3393ffb32dce4c266585232ead6d99a2c5480896c'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm-v7'; \ - sha256='9b7cbbf641caedc5fed87d1132aa4be45c74cfd6c502af48a9286e64b5f9e704'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v7'; \ + sha256='fb8c234f236baabe1f756fe5a0d68d39b58173fa96b38fc73fc4e5a0b78f9e49'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm64'; \ - sha256='3b83b3731916ba433feccaaa689fe5bcdc81c641d92c8e6c2ea865dfa141c97a'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm64'; \ + sha256='46c0f334772de3cb0b341cc415caf7339fb5cfc8b8438ebcb5a10e7f23800d36'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-ppc64le'; \ - sha256='7f1fdd2c9b81513b2feab5c8222842bae80cd4b919facadbc2bf485d3b0708fd'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-ppc64le'; \ + sha256='695822f3edbec94790fecc2d5d98de18733317a9b47b2cd76ebc150c4db09bad'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-riscv64'; \ - sha256='a5fc405944c4aaa4bb69d5f40c830de4d52dd84230841f46939603c84edb3ff3'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-riscv64'; \ + sha256='b5333f39daeefdcc4f7e37e6c2ce82a116ca21714f3d14a0d1c77ccb7f2cb1a7'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-s390x'; \ - sha256='154b7faa9ecc6fceac2f486928815124bd794f25b3aceb7c15c51687be274204'; \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-s390x'; \ + sha256='fe1855c35f148aa9d84ebdc6e89af4f4173cf00c6672d799a607ed4177bfea4c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 42462decd..fe4bf9c59 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.38.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 fd2e18501910dd535ea3aa7f69010b3cfdfba0f47aa27674124554386dfa26f3 +ENV DOCKER_BUILDX_VERSION 0.38.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 50c66a2e0..129503777 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.38.1 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 fd2e18501910dd535ea3aa7f69010b3cfdfba0f47aa27674124554386dfa26f3 +ENV DOCKER_BUILDX_VERSION 0.38.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 7500bede2..798d84db0 100644 --- a/versions.json +++ b/versions.json @@ -22,92 +22,92 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.38.1.linux-amd64", - "sha256": "e25d5cd675092bb5d1d03632fdc46cdf3fede7b514dc5f023a105e00d3ce5ad4", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-amd64" + "file": "buildx-v0.38.2.linux-amd64", + "sha256": "7992ec09413b80ff57ba4e081f56fc833d7bac1d5e71143c6c809e7e6065f6d6", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.38.1.linux-arm-v6", - "sha256": "a1d906b59689858d11e951701b2ce8fc76215d22df416f00e65da5b86be908b8", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm-v6" + "file": "buildx-v0.38.2.linux-arm-v6", + "sha256": "47c3eba42d0c55c5843193b3393ffb32dce4c266585232ead6d99a2c5480896c", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.38.1.linux-arm-v7", - "sha256": "9b7cbbf641caedc5fed87d1132aa4be45c74cfd6c502af48a9286e64b5f9e704", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm-v7" + "file": "buildx-v0.38.2.linux-arm-v7", + "sha256": "fb8c234f236baabe1f756fe5a0d68d39b58173fa96b38fc73fc4e5a0b78f9e49", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.38.1.linux-arm64", - "sha256": "3b83b3731916ba433feccaaa689fe5bcdc81c641d92c8e6c2ea865dfa141c97a", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-arm64" + "file": "buildx-v0.38.2.linux-arm64", + "sha256": "46c0f334772de3cb0b341cc415caf7339fb5cfc8b8438ebcb5a10e7f23800d36", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.38.1.darwin-amd64", - "sha256": "76e7a809cc98d34a4c1b7db23feac673def5b8dcdddd9e713ef26598689aa796", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.darwin-amd64" + "file": "buildx-v0.38.2.darwin-amd64", + "sha256": "ad2418546e6d168a3e3b59fdf2a24997bc84263abeb4a5d9d0422cfe782743fc", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.38.1.darwin-arm64", - "sha256": "6f20ba2437865311ef99015bf5d1039c3c8e4d2177c1c64aa41b134b5ecd3012", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.darwin-arm64" + "file": "buildx-v0.38.2.darwin-arm64", + "sha256": "81702e18713cfd495bfe594943fa57f470eda16c0653ae3de15cd411df273c41", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.38.1.freebsd-amd64", - "sha256": "478a37dfacf33adc58c0359932b7d077dadb68b3c4e827ff65716d3f8fa466aa", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.freebsd-amd64" + "file": "buildx-v0.38.2.freebsd-amd64", + "sha256": "d7db8b1de20b1a089ae5fd5b6f2b599098ef4082bc7c05fab91a668691d6d686", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.38.1.freebsd-arm64", - "sha256": "ef1e2d89ca528dde4e1ab4a3bd9661fe4c4219d960f4c166d79e5e3b9c34e8ce", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.freebsd-arm64" + "file": "buildx-v0.38.2.freebsd-arm64", + "sha256": "98ebc419f2109bc3a9bc882119a6783c53adff0394841902912faf211e6ef386", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.38.1.netbsd-amd64", - "sha256": "b0cf8a7de4ab0eaa3b8f71d7833a93e19053580ef1691182c68781bb0a0562e6", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.netbsd-amd64" + "file": "buildx-v0.38.2.netbsd-amd64", + "sha256": "a62e4f0df71d5d91c8db5f500db28df30540030b8f20e3d945413059b35884c2", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.38.1.netbsd-arm64", - "sha256": "748df205e7efa8a1756a403a5f64619c02052ba4bdac12b80d60a79469609c03", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.netbsd-arm64" + "file": "buildx-v0.38.2.netbsd-arm64", + "sha256": "07a3a6bbc9bb695b2fb6642bae306655801f8befa11b1b3e8cde7c39f59bda0d", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.38.1.openbsd-amd64", - "sha256": "664af842d593f6ecadaec0faa69c51991a81ef15ee9bbb38e436e3665f1a6452", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.openbsd-amd64" + "file": "buildx-v0.38.2.openbsd-amd64", + "sha256": "5f96af1dc3c326d57543ae2155dc9915e16cc0aa0ca48fab1373b44cc55498ce", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.38.1.openbsd-arm64", - "sha256": "714b304c105a720dbd0f3eefcf7fc0fb90885a48807418c9a57a83661b9f251f", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.openbsd-arm64" + "file": "buildx-v0.38.2.openbsd-arm64", + "sha256": "4885cdcc2e2906eb2cb4192d2526c992a36e7767b5c3e0f8cd8f07703f0a5213", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.38.1.linux-ppc64le", - "sha256": "7f1fdd2c9b81513b2feab5c8222842bae80cd4b919facadbc2bf485d3b0708fd", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-ppc64le" + "file": "buildx-v0.38.2.linux-ppc64le", + "sha256": "695822f3edbec94790fecc2d5d98de18733317a9b47b2cd76ebc150c4db09bad", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.38.1.linux-riscv64", - "sha256": "a5fc405944c4aaa4bb69d5f40c830de4d52dd84230841f46939603c84edb3ff3", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-riscv64" + "file": "buildx-v0.38.2.linux-riscv64", + "sha256": "b5333f39daeefdcc4f7e37e6c2ce82a116ca21714f3d14a0d1c77ccb7f2cb1a7", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-riscv64" }, "s390x": { - "file": "buildx-v0.38.1.linux-s390x", - "sha256": "154b7faa9ecc6fceac2f486928815124bd794f25b3aceb7c15c51687be274204", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.linux-s390x" + "file": "buildx-v0.38.2.linux-s390x", + "sha256": "fe1855c35f148aa9d84ebdc6e89af4f4173cf00c6672d799a607ed4177bfea4c", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.38.1.windows-amd64.exe", - "sha256": "fd2e18501910dd535ea3aa7f69010b3cfdfba0f47aa27674124554386dfa26f3", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.windows-amd64.exe" + "file": "buildx-v0.38.2.windows-amd64.exe", + "sha256": "9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.38.1.windows-arm64.exe", - "sha256": "2d4e2e78d7ddf0ea6d63acde7e73599717e94e3f9417edd23d4ffeceef6777fc", - "url": "https://github.com/docker/buildx/releases/download/v0.38.1/buildx-v0.38.1.windows-arm64.exe" + "file": "buildx-v0.38.2.windows-arm64.exe", + "sha256": "07b564aa6a6a88d65c52f538066f25ad2ea3140bc1d7de523fe083ca8cbcbc5b", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-arm64.exe" } }, - "version": "0.38.1" + "version": "0.38.2" }, "compose": { "arches": { From 3e782bbabff3af541d2699cf62bd25ec12d3feb6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 3 Nov 2026 14:40:45 -0800 Subject: [PATCH 655/667] Update 29 to 29.9.3 --- 29/cli/Dockerfile | 10 +++++----- 29/dind-rootless/Dockerfile | 4 ++-- 29/dind/Dockerfile | 8 ++++---- 29/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 29/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 6aac6351f..9611e898e 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.9.2 +ENV DOCKER_VERSION 29.9.3 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.9.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.9.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 5210381e9..4d110a254 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,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-29.9.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index 978e3851f..f23d1ca19 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -56,16 +56,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.3.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.9.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.9.3.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.3.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.2.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.3.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index fe4bf9c59..829713669 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/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 29.9.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.2.zip +ENV DOCKER_VERSION 29.9.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.3.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/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 129503777..ef413a931 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/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 29.9.2 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.2.zip +ENV DOCKER_VERSION 29.9.3 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.3.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/versions.json b/versions.json index 798d84db0..4606570ba 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,21 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.9.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.9.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.3.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.9.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.9.3.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.9.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.9.3.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.9.2.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.2.tgz" + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.9.3.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.3.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.9.2.zip" + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.9.3.zip" } }, "buildx": { @@ -177,7 +177,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.9.2" + "version": "29.9.3" }, "29-rc": null } From f9a1f03571c804bd36e19dc4ced37c4d541acd7a Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 5 Nov 2026 20:04:15 -0800 Subject: [PATCH 656/667] Update 29-rc to 29.10.0-rc.1, buildx 0.38.2, compose 5.7.0 --- 29-rc/cli/Dockerfile | 173 +++++++++++++ 29-rc/cli/docker-entrypoint.sh | 61 +++++ 29-rc/cli/modprobe.sh | 20 ++ 29-rc/dind-rootless/Dockerfile | 54 ++++ 29-rc/dind/Dockerfile | 110 ++++++++ 29-rc/dind/dockerd-entrypoint.sh | 238 ++++++++++++++++++ .../windowsservercore-ltsc2022/Dockerfile | 91 +++++++ .../windowsservercore-ltsc2025/Dockerfile | 91 +++++++ versions.json | 187 +++++++++++++- 9 files changed, 1024 insertions(+), 1 deletion(-) create mode 100644 29-rc/cli/Dockerfile create mode 100755 29-rc/cli/docker-entrypoint.sh create mode 100755 29-rc/cli/modprobe.sh create mode 100644 29-rc/dind-rootless/Dockerfile create mode 100644 29-rc/dind/Dockerfile create mode 100755 29-rc/dind/dockerd-entrypoint.sh create mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile create mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile new file mode 100644 index 000000000..679296f51 --- /dev/null +++ b/29-rc/cli/Dockerfile @@ -0,0 +1,173 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM alpine:3.24 + +RUN apk add --no-cache \ + ca-certificates \ +# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 + openssh-client \ +# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 + git + +# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) +# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 +# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 +# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf +RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf + +# pre-add a "docker" group for socket usage +RUN set -eux; \ + addgroup -g 2375 -S docker + +ENV DOCKER_VERSION 29.10.0-rc.1 + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.1.tgz'; \ + ;; \ + 'ppc64le') \ + url='https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.1.tgz'; \ + ;; \ + 's390x') \ + url='https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ + 'docker/docker' \ + ; \ + rm docker.tgz; \ + \ + docker --version + +ENV DOCKER_BUILDX_VERSION 0.38.2 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-amd64'; \ + sha256='7992ec09413b80ff57ba4e081f56fc833d7bac1d5e71143c6c809e7e6065f6d6'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v6'; \ + sha256='47c3eba42d0c55c5843193b3393ffb32dce4c266585232ead6d99a2c5480896c'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v7'; \ + sha256='fb8c234f236baabe1f756fe5a0d68d39b58173fa96b38fc73fc4e5a0b78f9e49'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm64'; \ + sha256='46c0f334772de3cb0b341cc415caf7339fb5cfc8b8438ebcb5a10e7f23800d36'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-ppc64le'; \ + sha256='695822f3edbec94790fecc2d5d98de18733317a9b47b2cd76ebc150c4db09bad'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-riscv64'; \ + sha256='b5333f39daeefdcc4f7e37e6c2ce82a116ca21714f3d14a0d1c77ccb7f2cb1a7'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-s390x'; \ + sha256='fe1855c35f148aa9d84ebdc6e89af4f4173cf00c6672d799a607ed4177bfea4c'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-buildx' "$url"; \ + echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-buildx' "$plugin"; \ + chmod +x "$plugin"; \ + \ + docker buildx version + +ENV DOCKER_COMPOSE_VERSION 5.7.0 +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-x86_64'; \ + sha256='7758048ad38e580f22559603312874fec8bb638d021a9e64182385fc17cc12a2'; \ + ;; \ + 'armhf') \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv6'; \ + sha256='1d6589e2a9d6c6d5ad8e53491ea9e07cb8be45d6cbd44ba5575f38ada2dd5998'; \ + ;; \ + 'armv7') \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv7'; \ + sha256='d18e5c549fd3595b36846fe00d01e2af5a37d4baec7945c557a0abda9af63c91'; \ + ;; \ + 'aarch64') \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-aarch64'; \ + sha256='15861535d14e26555736b49376c95e14bfd94285366c8446bfac7156a972e76f'; \ + ;; \ + 'ppc64le') \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-ppc64le'; \ + sha256='2f47de2439791611614ca3d23c1c4daf76f3842f2dca7d0b21c20cb1abb09557'; \ + ;; \ + 'riscv64') \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-riscv64'; \ + sha256='0d069b424e703d1e7e79bc1cba46b6e51c0d915847ba88612add8117bf4239ed'; \ + ;; \ + 's390x') \ + url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-s390x'; \ + sha256='8d7b4b5e61a7659d14a5cc2d16c6e2119b7113af1858b4879a7463707eee24ca'; \ + ;; \ + *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ + esac; \ + \ + wget -O 'docker-compose' "$url"; \ + echo "$sha256 *"'docker-compose' | sha256sum -c -; \ + \ + plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ + mkdir -p "$(dirname "$plugin")"; \ + mv -vT 'docker-compose' "$plugin"; \ + chmod +x "$plugin"; \ + \ + ln -sv "$plugin" /usr/local/bin/; \ + docker-compose --version; \ + docker compose version + +COPY modprobe.sh /usr/local/bin/modprobe +COPY docker-entrypoint.sh /usr/local/bin/ + +# https://github.com/docker-library/docker/pull/166 +# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates +# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH +# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) +ENV DOCKER_TLS_CERTDIR=/certs +# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode +RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client +# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) + +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh new file mode 100755 index 000000000..d41cef8e3 --- /dev/null +++ b/29-rc/cli/docker-entrypoint.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu + +# first arg is `-f` or `--some-option` +if [ "${1#-}" != "$1" ]; then + set -- docker "$@" +fi + +# if our command is a valid Docker subcommand, let's invoke it through Docker instead +# (this allows for "docker run docker ps", etc) +if docker help "$1" > /dev/null 2>&1; then + set -- docker "$@" +fi + +_should_tls() { + [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ + && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] +} + +# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly +if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then + export DOCKER_HOST=unix:///var/run/docker.sock +elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then + export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" +fi + +# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value +if [ -z "${DOCKER_HOST:-}" ]; then + if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then + export DOCKER_HOST='tcp://docker:2376' + else + export DOCKER_HOST='tcp://docker:2375' + fi +fi +if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ + && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ + && [ -z "${DOCKER_CERT_PATH:-}" ] \ + && _should_tls \ +; then + export DOCKER_TLS_VERIFY=1 + export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" +fi + +if [ "$1" = 'dockerd' ]; then + cat >&2 <<-'EOW' + + 📎 Hey there! It looks like you're trying to run a Docker daemon. + + You probably should use the "dind" image variant instead, something like: + + docker run --privileged --name some-docker ... docker:dind ... + + See https://hub.docker.com/_/docker/ for more documentation and usage examples. + + EOW + sleep 3 +fi + +exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh new file mode 100755 index 000000000..b357d893f --- /dev/null +++ b/29-rc/cli/modprobe.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +# "modprobe" without modprobe +# https://twitter.com/lucabruno/status/902934379835662336 + +# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe + +# Docker often uses "modprobe -va foo bar baz" +# so we ignore modules that start with "-" +for module; do + if [ "${module#-}" = "$module" ]; then + ip link show "$module" || true + lsmod | grep "$module" || true + fi +done + +# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort +export PATH='/usr/sbin:/usr/bin:/sbin:/bin' +exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile new file mode 100644 index 000000000..0b588e617 --- /dev/null +++ b/29-rc/dind-rootless/Dockerfile @@ -0,0 +1,54 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-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 +# slirp4netns is recommended as rootlesskit's net driver +# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended +RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns + +# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR +RUN mkdir /run/user && chmod 1777 /run/user + +# create a default user preconfigured for running rootless dockerd +RUN set -eux; \ + adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ + echo 'rootless:100000:65536' >> /etc/subuid; \ + echo 'rootless:100000:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.10.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.10.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'rootless.tgz' "$url"; \ + \ + tar --extract \ + --file rootless.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + 'docker-rootless-extras/rootlesskit' \ + ; \ + rm rootless.tgz; \ + \ + rootlesskit --version + +# pre-create "/var/lib/docker" for our rootless user +RUN set -eux; \ + mkdir -p /home/rootless/.local/share/docker; \ + chown -R rootless:rootless /home/rootless/.local/share/docker +VOLUME /home/rootless/.local/share/docker +USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile new file mode 100644 index 000000000..9f5bcfb64 --- /dev/null +++ b/29-rc/dind/Dockerfile @@ -0,0 +1,110 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM docker:29-rc-cli + +# Runtime dependencies: +# - https://github.com/moby/moby/blob/864598f8c2677189e308eb4a3b3c0dd41fc06599/project/PACKAGERS.md#runtime-dependencies#runtime-dependencies +# - https://github.com/docker/packaging/blob/0ba325d178593583f190dc91566214a85c3880ad/pkg/docker-engine/deb/control#L24-L36 +RUN set -eux; \ + apk add --no-cache \ + ip6tables \ + iptables \ + openssl \ + pigz \ + shadow-uidmap \ + xz \ + ; + +# dind might be used on systems where the nf_tables kernel module isn't available. In that case, +# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 +RUN set -eux; \ + apk add --no-cache iptables-legacy; \ +# set up a symlink farm we can use PATH to switch to legacy with + mkdir -p /usr/local/sbin/.iptables-legacy; \ +# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 + for f in \ + iptables \ + iptables-save \ + iptables-restore \ + ip6tables \ + ip6tables-save \ + ip6tables-restore \ + ; do \ +# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. +# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 + b="$(command -v "${f/tables/tables-legacy}")"; \ + "$b" --version; \ + ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ + done; \ +# verify it works (and gets us legacy) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ + iptables --version | grep legacy + +# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box +RUN set -eux; \ + addgroup -S dockremap; \ + adduser -S -G dockremap dockremap; \ + echo 'dockremap:165536:65536' >> /etc/subuid; \ + echo 'dockremap:165536:65536' >> /etc/subgid + +RUN set -eux; \ + \ + apkArch="$(apk --print-arch)"; \ + case "$apkArch" in \ + 'x86_64') \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.1.tgz'; \ + ;; \ + 'armhf') \ + url='https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.1.tgz'; \ + ;; \ + 'armv7') \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.1.tgz'; \ + ;; \ + 'aarch64') \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.1.tgz'; \ + ;; \ + 'ppc64le') \ + url='https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.1.tgz'; \ + ;; \ + 's390x') \ + url='https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.1.tgz'; \ + ;; \ + *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ + esac; \ + \ + wget -O 'docker.tgz' "$url"; \ + \ + tar --extract \ + --file docker.tgz \ + --strip-components 1 \ + --directory /usr/local/bin/ \ + --no-same-owner \ +# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer + --exclude 'docker/docker' \ +# exclude containerd, relying on the "embedded containerd" instead: https://github.com/moby/moby/pull/53388 (makes for a smaller image) + --exclude 'docker/containerd' \ + ; \ + rm docker.tgz; \ + \ + dockerd --version; \ + ctr --version; \ + runc --version + +# https://github.com/moby/moby/tree/master/hack/dind +ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d + +RUN set -eux; \ + wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/moby/moby/${DIND_COMMIT}/hack/dind"; \ + chmod +x /usr/local/bin/dind + +COPY dockerd-entrypoint.sh /usr/local/bin/ + +VOLUME /var/lib/docker +EXPOSE 2375 2376 + +ENTRYPOINT ["dockerd-entrypoint.sh"] +CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh new file mode 100755 index 000000000..130883d69 --- /dev/null +++ b/29-rc/dind/dockerd-entrypoint.sh @@ -0,0 +1,238 @@ +#!/bin/sh +set -eu + +_tls_ensure_private() { + local f="$1"; shift + [ -s "$f" ] || openssl genrsa -out "$f" 4096 +} +_tls_san() { + { + ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' + { + cat /etc/hostname + echo 'docker' + echo 'localhost' + hostname -f + hostname -s + } | sed 's/^/DNS:/' + [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" + } | sort -u | xargs printf '%s,' | sed "s/,\$//" +} +_tls_generate_certs() { + local dir="$1"; shift + + # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) + # if ca/key.pem || !ca/cert.pem, generate CA public if necessary + # if ca/key.pem, generate server public + # if ca/key.pem, generate client public + # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) + + if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + return 0 + fi + + # https://github.com/FiloSottile/mkcert/issues/174 + local certValidDays='825' + + if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then + # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA + mkdir -p "$dir/ca" + _tls_ensure_private "$dir/ca/key.pem" + openssl req -new -key "$dir/ca/key.pem" \ + -out "$dir/ca/cert.pem" \ + -subj '/CN=docker:dind CA' \ + -x509 \ + -days "$certValidDays" \ + -addext keyUsage=critical,digitalSignature,keyCertSign + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a server key + mkdir -p "$dir/server" + _tls_ensure_private "$dir/server/key.pem" + openssl req -new -key "$dir/server/key.pem" \ + -out "$dir/server/csr.pem" \ + -subj '/CN=docker:dind server' + cat > "$dir/server/openssl.cnf" <<-EOF + [ x509_exts ] + extendedKeyUsage = serverAuth + subjectAltName = $(_tls_san) + EOF + openssl x509 -req \ + -in "$dir/server/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/server/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/server/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/server/ca.pem" + openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" + fi + + if [ -s "$dir/ca/key.pem" ]; then + # if we have a CA private key, we should create/manage a client key + mkdir -p "$dir/client" + _tls_ensure_private "$dir/client/key.pem" + chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts + openssl req -new \ + -key "$dir/client/key.pem" \ + -out "$dir/client/csr.pem" \ + -subj '/CN=docker:dind client' + cat > "$dir/client/openssl.cnf" <<-'EOF' + [ x509_exts ] + extendedKeyUsage = clientAuth + EOF + openssl x509 -req \ + -in "$dir/client/csr.pem" \ + -CA "$dir/ca/cert.pem" \ + -CAkey "$dir/ca/key.pem" \ + -CAcreateserial \ + -out "$dir/client/cert.pem" \ + -days "$certValidDays" \ + -extfile "$dir/client/openssl.cnf" \ + -extensions x509_exts + cp "$dir/ca/cert.pem" "$dir/client/ca.pem" + openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" + fi +} + +# no arguments passed +# or first arg is `-f` or `--some-option` +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) + uid="$(id -u)" + if [ "$uid" = '0' ]; then + dockerSocket='unix:///var/run/docker.sock' + else + # if we're not root, we must be trying to run rootless + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" + fi + case "${DOCKER_HOST:-}" in + unix://*) + dockerSocket="$DOCKER_HOST" + ;; + esac + + # add our default arguments + if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then + _tls_generate_certs "$DOCKER_TLS_CERTDIR" + # generate certs and use TLS if requested/possible (default in 19.03+) + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2376 \ + --tlsverify \ + --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ + --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ + --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" + else + # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs + set -- dockerd \ + --host="$dockerSocket" \ + --host=tcp://0.0.0.0:2375 \ + "$@" + DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" + fi +fi + +if [ "$1" = 'dockerd' ]; then + # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) + find /run /var/run -iname 'docker*.pid' -delete || : + + # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) + set -- docker-init -- "$@" + + iptablesLegacy= + if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then + # let users choose explicitly to legacy or not to legacy + iptablesLegacy="$DOCKER_IPTABLES_LEGACY" + if [ -n "$iptablesLegacy" ]; then + modprobe ip_tables || : + modprobe ip6_tables || : + else + modprobe nf_tables || : + fi + elif ( + # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 + # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 + for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do + if [ -r "$f" ] && b="$(cat "$f")" && [ -n "$b" ]; then + exit 0 + fi + done + exit 1 + ); then + # if we already have any "legacy" iptables rules, we should always use legacy + iptablesLegacy=1 + elif ! iptables -nL > /dev/null 2>&1; then + # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) + # https://github.com/docker-library/docker/issues/350 + # https://github.com/moby/moby/issues/26824 + # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 + modprobe nf_tables || : + if ! iptables -nL > /dev/null 2>&1; then + # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) + modprobe ip_tables || : + modprobe ip6_tables || : + if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then + iptablesLegacy=1 + fi + fi + fi + if [ -n "$iptablesLegacy" ]; then + # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) + export PATH="/usr/local/sbin/.iptables-legacy:$PATH" + fi + iptables --version # so users can see whether it's legacy or not + + uid="$(id -u)" + if [ "$uid" != '0' ]; then + # if we're not root, we must be trying to run rootless + if ! command -v rootlesskit > /dev/null; then + echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" + exit 1 + fi + user="$(id -un 2>/dev/null || :)" + if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then + echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" + exit 1 + fi + : "${XDG_RUNTIME_DIR:=/run/user/$uid}" + export XDG_RUNTIME_DIR + if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then + echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" + exit 1 + fi + if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" + exit 1 + fi + if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then + echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" + exit 1 + fi + # TODO overlay support detection? + exec rootlesskit \ + --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ + --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ + --disable-host-loopback \ + --port-driver=builtin \ + --copy-up=/etc \ + --copy-up=/run \ + ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ + "$@" + elif [ -x '/usr/local/bin/dind' ]; then + # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it + set -- '/usr/local/bin/dind' "$@" + fi +else + # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too + set -- docker-entrypoint.sh "$@" +fi + +exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile new file mode 100644 index 000000000..1ec5d07eb --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2022 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.10.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.38.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.7.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile new file mode 100644 index 000000000..77da2b170 --- /dev/null +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -0,0 +1,91 @@ +# +# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" +# +# PLEASE DO NOT EDIT IT DIRECTLY. +# + +FROM mcr.microsoft.com/windows/servercore:ltsc2025 + +# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 +SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + +# PATH isn't actually set in the Docker image, so we have to set it from within the container +RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ + Write-Host ('Updating PATH: {0}' -f $newPath); \ + [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); +# doing this first to share cache across versions more aggressively + +ENV DOCKER_VERSION 29.10.0-rc.1 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.1.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) + +RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ + \ + Write-Host 'Expanding ...'; \ + Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ +# (this archive has a "docker/..." directory in it already) + \ + Write-Host 'Removing ...'; \ + Remove-Item @( \ + 'docker.zip', \ + ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ + ) -Force; \ + \ + Write-Host 'Verifying install ("docker --version") ...'; \ + docker --version; \ + \ + Write-Host 'Complete.'; + +# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 +ENV DOCKER_BUILDX_VERSION 0.38.2 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0 +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-buildx.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker buildx version") ...'; \ + docker buildx version; \ + \ + Write-Host 'Complete.'; +ENV DOCKER_COMPOSE_VERSION 5.7.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f +RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ + Write-Host ('Creating {0} ...' -f $dir); \ + New-Item -ItemType Directory $dir -Force; \ + \ + $plugin = ('{0}\docker-compose.exe' -f $dir); \ + Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ + Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ + \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ + if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ + Write-Host 'Verifying install ("docker compose version") ...'; \ + docker compose version; \ + \ + $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ + Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ + New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ + \ + Write-Host 'Verifying install ("docker-compose --version") ...'; \ + docker-compose --version; \ + \ + Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 4606570ba..01c7980d4 100644 --- a/versions.json +++ b/versions.json @@ -179,5 +179,190 @@ ], "version": "29.9.3" }, - "29-rc": null + "29-rc": { + "arches": { + "amd64": { + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.10.0-rc.1.tgz" + }, + "arm32v6": { + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.1.tgz" + }, + "arm32v7": { + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.1.tgz" + }, + "arm64v8": { + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.1.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.10.0-rc.1.tgz" + }, + "ppc64le": { + "dockerUrl": "https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.1.tgz" + }, + "s390x": { + "dockerUrl": "https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.1.tgz" + }, + "windows-amd64": { + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.1.zip" + } + }, + "buildx": { + "arches": { + "amd64": { + "file": "buildx-v0.38.2.linux-amd64", + "sha256": "7992ec09413b80ff57ba4e081f56fc833d7bac1d5e71143c6c809e7e6065f6d6", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-amd64" + }, + "arm32v6": { + "file": "buildx-v0.38.2.linux-arm-v6", + "sha256": "47c3eba42d0c55c5843193b3393ffb32dce4c266585232ead6d99a2c5480896c", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v6" + }, + "arm32v7": { + "file": "buildx-v0.38.2.linux-arm-v7", + "sha256": "fb8c234f236baabe1f756fe5a0d68d39b58173fa96b38fc73fc4e5a0b78f9e49", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v7" + }, + "arm64v8": { + "file": "buildx-v0.38.2.linux-arm64", + "sha256": "46c0f334772de3cb0b341cc415caf7339fb5cfc8b8438ebcb5a10e7f23800d36", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm64" + }, + "darwin-amd64": { + "file": "buildx-v0.38.2.darwin-amd64", + "sha256": "ad2418546e6d168a3e3b59fdf2a24997bc84263abeb4a5d9d0422cfe782743fc", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.darwin-amd64" + }, + "darwin-arm64v8": { + "file": "buildx-v0.38.2.darwin-arm64", + "sha256": "81702e18713cfd495bfe594943fa57f470eda16c0653ae3de15cd411df273c41", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.darwin-arm64" + }, + "freebsd-amd64": { + "file": "buildx-v0.38.2.freebsd-amd64", + "sha256": "d7db8b1de20b1a089ae5fd5b6f2b599098ef4082bc7c05fab91a668691d6d686", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.freebsd-amd64" + }, + "freebsd-arm64v8": { + "file": "buildx-v0.38.2.freebsd-arm64", + "sha256": "98ebc419f2109bc3a9bc882119a6783c53adff0394841902912faf211e6ef386", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.freebsd-arm64" + }, + "netbsd-amd64": { + "file": "buildx-v0.38.2.netbsd-amd64", + "sha256": "a62e4f0df71d5d91c8db5f500db28df30540030b8f20e3d945413059b35884c2", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.netbsd-amd64" + }, + "netbsd-arm64v8": { + "file": "buildx-v0.38.2.netbsd-arm64", + "sha256": "07a3a6bbc9bb695b2fb6642bae306655801f8befa11b1b3e8cde7c39f59bda0d", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.netbsd-arm64" + }, + "openbsd-amd64": { + "file": "buildx-v0.38.2.openbsd-amd64", + "sha256": "5f96af1dc3c326d57543ae2155dc9915e16cc0aa0ca48fab1373b44cc55498ce", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.openbsd-amd64" + }, + "openbsd-arm64v8": { + "file": "buildx-v0.38.2.openbsd-arm64", + "sha256": "4885cdcc2e2906eb2cb4192d2526c992a36e7767b5c3e0f8cd8f07703f0a5213", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.openbsd-arm64" + }, + "ppc64le": { + "file": "buildx-v0.38.2.linux-ppc64le", + "sha256": "695822f3edbec94790fecc2d5d98de18733317a9b47b2cd76ebc150c4db09bad", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-ppc64le" + }, + "riscv64": { + "file": "buildx-v0.38.2.linux-riscv64", + "sha256": "b5333f39daeefdcc4f7e37e6c2ce82a116ca21714f3d14a0d1c77ccb7f2cb1a7", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-riscv64" + }, + "s390x": { + "file": "buildx-v0.38.2.linux-s390x", + "sha256": "fe1855c35f148aa9d84ebdc6e89af4f4173cf00c6672d799a607ed4177bfea4c", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-s390x" + }, + "windows-amd64": { + "file": "buildx-v0.38.2.windows-amd64.exe", + "sha256": "9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe" + }, + "windows-arm64v8": { + "file": "buildx-v0.38.2.windows-arm64.exe", + "sha256": "07b564aa6a6a88d65c52f538066f25ad2ea3140bc1d7de523fe083ca8cbcbc5b", + "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-arm64.exe" + } + }, + "version": "0.38.2" + }, + "compose": { + "arches": { + "amd64": { + "file": "docker-compose-linux-x86_64", + "sha256": "7758048ad38e580f22559603312874fec8bb638d021a9e64182385fc17cc12a2", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-x86_64" + }, + "arm32v6": { + "file": "docker-compose-linux-armv6", + "sha256": "1d6589e2a9d6c6d5ad8e53491ea9e07cb8be45d6cbd44ba5575f38ada2dd5998", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv6" + }, + "arm32v7": { + "file": "docker-compose-linux-armv7", + "sha256": "d18e5c549fd3595b36846fe00d01e2af5a37d4baec7945c557a0abda9af63c91", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv7" + }, + "arm64v8": { + "file": "docker-compose-linux-aarch64", + "sha256": "15861535d14e26555736b49376c95e14bfd94285366c8446bfac7156a972e76f", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-aarch64" + }, + "darwin-amd64": { + "file": "docker-compose-darwin-x86_64", + "sha256": "f57fad1fc3a942309b76da99e0a1c49dc97f7c56d4a03593d71bb01577aeeb29", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-darwin-x86_64" + }, + "darwin-arm64v8": { + "file": "docker-compose-darwin-aarch64", + "sha256": "54495ff81dd8cae11861455f0308a293a530149beba8f1d90ff3f295b11cf035", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-darwin-aarch64" + }, + "ppc64le": { + "file": "docker-compose-linux-ppc64le", + "sha256": "2f47de2439791611614ca3d23c1c4daf76f3842f2dca7d0b21c20cb1abb09557", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-ppc64le" + }, + "riscv64": { + "file": "docker-compose-linux-riscv64", + "sha256": "0d069b424e703d1e7e79bc1cba46b6e51c0d915847ba88612add8117bf4239ed", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-riscv64" + }, + "s390x": { + "file": "docker-compose-linux-s390x", + "sha256": "8d7b4b5e61a7659d14a5cc2d16c6e2119b7113af1858b4879a7463707eee24ca", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-s390x" + }, + "windows-amd64": { + "file": "docker-compose-windows-x86_64.exe", + "sha256": "f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe" + }, + "windows-arm64v8": { + "file": "docker-compose-windows-aarch64.exe", + "sha256": "d622f50e48d0565c1d3ab8c410ef7287a9efe0cf2b2c803ff7878918592e27bf", + "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-aarch64.exe" + } + }, + "version": "5.7.0" + }, + "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", + "variants": [ + "cli", + "dind", + "dind-rootless", + "windows/windowsservercore-ltsc2025", + "windows/windowsservercore-ltsc2022" + ], + "version": "29.10.0-rc.1" + } } From c8790092815911a4aa5e27c7b339ce67b78faadc Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 11 Nov 2026 01:01:23 +0100 Subject: [PATCH 657/667] 29-rc: add checksum verification (#591) Signed-off-by: Sebastiaan van Stijn Co-authored-by: Tianon Gravi --- 29-rc/cli/Dockerfile | 7 +++++ 29-rc/dind-rootless/Dockerfile | 2 ++ 29-rc/dind/Dockerfile | 7 +++++ .../windowsservercore-ltsc2022/Dockerfile | 10 +++++-- .../windowsservercore-ltsc2025/Dockerfile | 10 +++++-- Dockerfile-cli.template | 2 +- Dockerfile-dind-rootless.template | 2 +- Dockerfile-dind.template | 2 +- Dockerfile-windows-servercore.template | 13 ++++++++ shared.jq | 8 ++--- versions.json | 9 ++++++ versions.sh | 30 +++++++++++++++++-- 12 files changed, 87 insertions(+), 15 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 679296f51..4250919fb 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -31,26 +31,33 @@ RUN set -eux; \ case "$apkArch" in \ 'x86_64') \ url='https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.1.tgz'; \ + sha256='d023bcab935f045548c5df79ea96d1f3fccbc091cf9a8347139154859f4767b8'; \ ;; \ 'armhf') \ url='https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.1.tgz'; \ + sha256='55aedd3f6b42d8dd3e397358f0ca4fb321cb89cce325b9a239842866ecee3f8f'; \ ;; \ 'armv7') \ url='https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.1.tgz'; \ + sha256='d244956ea5ba6b9ca88acd24b6cc67ee5bd56c39f1d870a8d317ec472b0cc223'; \ ;; \ 'aarch64') \ url='https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.1.tgz'; \ + sha256='48348b68501015c3d9cc2c2a0344588eb0676cf68c38dd4ffd881a75e2d8662c'; \ ;; \ 'ppc64le') \ url='https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.1.tgz'; \ + sha256='1db34bee3e77a4af021631a5492b9385c3aafedd1b2aa3f693a60ca6760a3315'; \ ;; \ 's390x') \ url='https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.1.tgz'; \ + sha256='78546fc2dcf04c7844e3e3f54b05485da64c852fceee453f2c8bac7b4ecd896b'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ \ wget -O 'docker.tgz' "$url"; \ + echo "$sha256 *"'docker.tgz' | sha256sum -c -; \ \ tar --extract \ --file docker.tgz \ diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile index 0b588e617..93e4eda43 100644 --- a/29-rc/dind-rootless/Dockerfile +++ b/29-rc/dind-rootless/Dockerfile @@ -27,9 +27,11 @@ RUN set -eux; \ case "$apkArch" in \ 'x86_64') \ url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.10.0-rc.1.tgz'; \ + sha256='e63ea3c6e4a28575be61bae88303b335c9637198d79a1b1aaae17ad0f955abc9'; \ ;; \ 'aarch64') \ url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.10.0-rc.1.tgz'; \ + sha256='2db6e2f180b66a4b5f6555f56041c85e55537230aaf939fdf18d60e1cea59c9e'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile index 9f5bcfb64..a9331210f 100644 --- a/29-rc/dind/Dockerfile +++ b/29-rc/dind/Dockerfile @@ -57,26 +57,33 @@ RUN set -eux; \ case "$apkArch" in \ 'x86_64') \ url='https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.1.tgz'; \ + sha256='d023bcab935f045548c5df79ea96d1f3fccbc091cf9a8347139154859f4767b8'; \ ;; \ 'armhf') \ url='https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.1.tgz'; \ + sha256='55aedd3f6b42d8dd3e397358f0ca4fb321cb89cce325b9a239842866ecee3f8f'; \ ;; \ 'armv7') \ url='https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.1.tgz'; \ + sha256='d244956ea5ba6b9ca88acd24b6cc67ee5bd56c39f1d870a8d317ec472b0cc223'; \ ;; \ 'aarch64') \ url='https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.1.tgz'; \ + sha256='48348b68501015c3d9cc2c2a0344588eb0676cf68c38dd4ffd881a75e2d8662c'; \ ;; \ 'ppc64le') \ url='https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.1.tgz'; \ + sha256='1db34bee3e77a4af021631a5492b9385c3aafedd1b2aa3f693a60ca6760a3315'; \ ;; \ 's390x') \ url='https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.1.tgz'; \ + sha256='78546fc2dcf04c7844e3e3f54b05485da64c852fceee453f2c8bac7b4ecd896b'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ \ wget -O 'docker.tgz' "$url"; \ + echo "$sha256 *"'docker.tgz' | sha256sum -c -; \ \ tar --extract \ --file docker.tgz \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 1ec5d07eb..0f6a7f5fd 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -17,13 +17,17 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ ENV DOCKER_VERSION 29.10.0-rc.1 ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.1.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) +ENV DOCKER_SHA256 d3f21d8d1487ee8a0bc936cb65c5149b1f5bebe2d05499c6bcfdcd8b81030c7b RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_SHA256); \ + if ((Get-FileHash docker.zip -Algorithm sha256).Hash -ne $env:DOCKER_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ Write-Host 'Expanding ...'; \ Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ # (this archive has a "docker/..." directory in it already) diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 77da2b170..1518e5861 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -17,13 +17,17 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ ENV DOCKER_VERSION 29.10.0-rc.1 ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.1.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) +ENV DOCKER_SHA256 d3f21d8d1487ee8a0bc936cb65c5149b1f5bebe2d05499c6bcfdcd8b81030c7b RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_SHA256); \ + if ((Get-FileHash docker.zip -Algorithm sha256).Hash -ne $env:DOCKER_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ Write-Host 'Expanding ...'; \ Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ # (this archive has a "docker/..." directory in it already) diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template index 101e75358..273ddf5af 100644 --- a/Dockerfile-cli.template +++ b/Dockerfile-cli.template @@ -26,7 +26,7 @@ RUN set -eux; \ download({ arches: .arches, urlKey: "dockerUrl", - # TODO sha256Key (once Docker publishes them 😭) + sha256Key: "dockerSha256", target: "docker.tgz", }) }}; \ diff --git a/Dockerfile-dind-rootless.template b/Dockerfile-dind-rootless.template index 884fb56b0..85ba8c6f0 100644 --- a/Dockerfile-dind-rootless.template +++ b/Dockerfile-dind-rootless.template @@ -22,7 +22,7 @@ RUN set -eux; \ download({ arches: .arches, urlKey: "rootlessExtrasUrl", - # TODO sha256Key (once Docker publishes them 😭) + sha256Key: "rootlessExtrasSha256", target: "rootless.tgz", }) }}; \ diff --git a/Dockerfile-dind.template b/Dockerfile-dind.template index 446c03414..3c9459358 100644 --- a/Dockerfile-dind.template +++ b/Dockerfile-dind.template @@ -52,7 +52,7 @@ RUN set -eux; \ download({ arches: .arches, urlKey: "dockerUrl", - # TODO sha256Key (once Docker publishes them 😭) + sha256Key: "dockerSha256", target: "docker.tgz", }) }}; \ diff --git a/Dockerfile-windows-servercore.template b/Dockerfile-windows-servercore.template index b607c222b..d7969968d 100644 --- a/Dockerfile-windows-servercore.template +++ b/Dockerfile-windows-servercore.template @@ -11,13 +11,26 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ ENV DOCKER_VERSION {{ .version }} ENV DOCKER_URL {{ .arches["windows-amd64"].dockerUrl }} +{{ if .arches["windows-amd64"].dockerSha256 then ( -}} +ENV DOCKER_SHA256 {{ .arches["windows-amd64"].dockerSha256 }} +{{ ) else ( -}} +{{ # TODO remove this whole else block! as of 29.10.0-rc.1, we have checksums 🥳 -}} # 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) +{{ ) end -}} RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ \ +{{ if .arches["windows-amd64"].dockerSha256 then ( -}} + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_SHA256); \ + if ((Get-FileHash docker.zip -Algorithm sha256).Hash -ne $env:DOCKER_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ +{{ ) else "" end -}} Write-Host 'Expanding ...'; \ Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ # (this archive has a "docker/..." directory in it already) diff --git a/shared.jq b/shared.jq index c3213117e..ed950bbb3 100644 --- a/shared.jq +++ b/shared.jq @@ -40,11 +40,11 @@ def download(opts): | .value | .[opts.urlKey] as $url | (if $notSha256 then "none" else .[opts.sha256Key] end) as $sha256 - | select($apkArch and $url and $sha256) + | select($apkArch and $url) | (" \($apkArch | @sh)) url=\($url | @sh);" - + if $notSha256 then "" else " + + if $notSha256 or ($sha256 == null) then "" else " sha256=\($sha256 | @sh);" end + " ;;" @@ -57,9 +57,9 @@ def download(opts): wget -O \(opts.target | @sh) \"$url\";" , - if $notSha256 then "" else " + if opts.sha256Key and all(opts.arches[]; has(opts.sha256Key)) then " echo \"$sha256 *\"\(opts.target | @sh) | sha256sum -c -;" - end + else "" end ] | add | rtrimstr(";") | gsub("(?<=[^[:space:]])\n"; " \\\n") diff --git a/versions.json b/versions.json index 01c7980d4..c475497ac 100644 --- a/versions.json +++ b/versions.json @@ -182,26 +182,35 @@ "29-rc": { "arches": { "amd64": { + "dockerSha256": "d023bcab935f045548c5df79ea96d1f3fccbc091cf9a8347139154859f4767b8", "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.1.tgz", + "rootlessExtrasSha256": "e63ea3c6e4a28575be61bae88303b335c9637198d79a1b1aaae17ad0f955abc9", "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.10.0-rc.1.tgz" }, "arm32v6": { + "dockerSha256": "55aedd3f6b42d8dd3e397358f0ca4fb321cb89cce325b9a239842866ecee3f8f", "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.1.tgz" }, "arm32v7": { + "dockerSha256": "d244956ea5ba6b9ca88acd24b6cc67ee5bd56c39f1d870a8d317ec472b0cc223", "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.1.tgz" }, "arm64v8": { + "dockerSha256": "48348b68501015c3d9cc2c2a0344588eb0676cf68c38dd4ffd881a75e2d8662c", "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.1.tgz", + "rootlessExtrasSha256": "2db6e2f180b66a4b5f6555f56041c85e55537230aaf939fdf18d60e1cea59c9e", "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.10.0-rc.1.tgz" }, "ppc64le": { + "dockerSha256": "1db34bee3e77a4af021631a5492b9385c3aafedd1b2aa3f693a60ca6760a3315", "dockerUrl": "https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.1.tgz" }, "s390x": { + "dockerSha256": "78546fc2dcf04c7844e3e3f54b05485da64c852fceee453f2c8bac7b4ecd896b", "dockerUrl": "https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.1.tgz" }, "windows-amd64": { + "dockerSha256": "d3f21d8d1487ee8a0bc936cb65c5149b1f5bebe2d05499c6bcfdcd8b81030c7b", "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.1.zip" } }, diff --git a/versions.sh b/versions.sh index e67957bb8..0ef1ea359 100755 --- a/versions.sh +++ b/versions.sh @@ -228,7 +228,18 @@ for version in "${versions[@]}"; do else continue fi + if sha256="$(_curl "$url.sha256")"; then + sha256="${sha256%% *}" + if [[ ! "$sha256" =~ ^[[:xdigit:]]{64}$ ]]; then + echo >&2 "error: invalid checksum for $url: '$sha256'" + exit 1 + fi + export sha256 + doc="$(jq <<<"$doc" -c ' + .arches[env.bashbrewArch].dockerSha256 = env.sha256 + ')" + fi hasArches["$bashbrewArch"]=1 if [ -n "$windows" ]; then @@ -241,9 +252,24 @@ for version in "${versions[@]}"; do amd64 | arm64v8) rootlessExtrasUrl="https://download.docker.com/linux/static/$channel/$arch/docker-rootless-extras-$fullVersion.tgz" if _curl --head "$rootlessExtrasUrl" > /dev/null; then - export rootlessExtrasUrl + if rootlessExtrasSha256="$(_curl "$rootlessExtrasUrl.sha256")"; then + rootlessExtrasSha256="${rootlessExtrasSha256%% *}" + if [[ ! "$rootlessExtrasSha256" =~ ^[[:xdigit:]]{64}$ ]]; then + echo >&2 "error: invalid checksum for $rootlessExtrasUrl: '$rootlessExtrasSha256'" + exit 1 + fi + else + rootlessExtrasSha256= + fi + + export rootlessExtrasUrl rootlessExtrasSha256 doc="$(jq <<<"$doc" -c ' - .arches[env.bashbrewArch].rootlessExtrasUrl = env.rootlessExtrasUrl + .arches[env.bashbrewArch] |= ( + .rootlessExtrasUrl = env.rootlessExtrasUrl + | if env.rootlessExtrasSha256 != "" then + .rootlessExtrasSha256 = env.rootlessExtrasSha256 + end + ) ')" fi ;; From d0cd22a77e55575b524cbd47fbd8a6ecd2027f5e Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 11 Nov 2026 02:04:21 -0800 Subject: [PATCH 658/667] Update 29 to compose 5.7.1 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 9611e898e..451d29346 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -103,38 +103,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.7.0 +ENV DOCKER_COMPOSE_VERSION 5.7.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-x86_64'; \ - sha256='7758048ad38e580f22559603312874fec8bb638d021a9e64182385fc17cc12a2'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-x86_64'; \ + sha256='af426722a8af5de812fcee30cc1c39f0639f5f723cbadefb25e5d4db054064cf'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv6'; \ - sha256='1d6589e2a9d6c6d5ad8e53491ea9e07cb8be45d6cbd44ba5575f38ada2dd5998'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv6'; \ + sha256='923137699688e7ea1aade66c16b9a1d475150487ccc99636d0f1de3ce46e6107'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv7'; \ - sha256='d18e5c549fd3595b36846fe00d01e2af5a37d4baec7945c557a0abda9af63c91'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv7'; \ + sha256='c03e0c93cf747f311d39f6920a33c461fd0f7a6246439aaf259766527caa28f5'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-aarch64'; \ - sha256='15861535d14e26555736b49376c95e14bfd94285366c8446bfac7156a972e76f'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-aarch64'; \ + sha256='f2f49f903240895fa764c0dca3a14548b754ad9426f6b609ccaf55ec5a3aa2a5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-ppc64le'; \ - sha256='2f47de2439791611614ca3d23c1c4daf76f3842f2dca7d0b21c20cb1abb09557'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-ppc64le'; \ + sha256='e41bf397abf7fc7a1cd35a039676067e6fc36d022a48847584db63cff0d9d196'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-riscv64'; \ - sha256='0d069b424e703d1e7e79bc1cba46b6e51c0d915847ba88612add8117bf4239ed'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-riscv64'; \ + sha256='29ba4c5fc8eb53e2fa2d0327c640c6a727086fd7efae79da47bf0a82bde290f3'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-s390x'; \ - sha256='8d7b4b5e61a7659d14a5cc2d16c6e2119b7113af1858b4879a7463707eee24ca'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-s390x'; \ + sha256='078f555e41e7c2d37d47f81cffd6b80d77288ba562bee19ac00215205edca278'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 829713669..d5b67eeb9 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.7.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f +ENV DOCKER_COMPOSE_VERSION 5.7.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index ef413a931..5bba2606b 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.7.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f +ENV DOCKER_COMPOSE_VERSION 5.7.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index c475497ac..c34eca186 100644 --- a/versions.json +++ b/versions.json @@ -113,61 +113,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "7758048ad38e580f22559603312874fec8bb638d021a9e64182385fc17cc12a2", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-x86_64" + "sha256": "af426722a8af5de812fcee30cc1c39f0639f5f723cbadefb25e5d4db054064cf", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "1d6589e2a9d6c6d5ad8e53491ea9e07cb8be45d6cbd44ba5575f38ada2dd5998", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv6" + "sha256": "923137699688e7ea1aade66c16b9a1d475150487ccc99636d0f1de3ce46e6107", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d18e5c549fd3595b36846fe00d01e2af5a37d4baec7945c557a0abda9af63c91", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv7" + "sha256": "c03e0c93cf747f311d39f6920a33c461fd0f7a6246439aaf259766527caa28f5", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "15861535d14e26555736b49376c95e14bfd94285366c8446bfac7156a972e76f", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-aarch64" + "sha256": "f2f49f903240895fa764c0dca3a14548b754ad9426f6b609ccaf55ec5a3aa2a5", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "f57fad1fc3a942309b76da99e0a1c49dc97f7c56d4a03593d71bb01577aeeb29", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-darwin-x86_64" + "sha256": "c28b37c7bf1cc315acdf511c2c0f34ce19d4d33b6038611617063a99c45417c6", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "54495ff81dd8cae11861455f0308a293a530149beba8f1d90ff3f295b11cf035", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-darwin-aarch64" + "sha256": "5a9aa8b5fb5b1e3cd83f39c80e570ae30aafd74cd9b47264fbe4ff7e6e6251ca", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "2f47de2439791611614ca3d23c1c4daf76f3842f2dca7d0b21c20cb1abb09557", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-ppc64le" + "sha256": "e41bf397abf7fc7a1cd35a039676067e6fc36d022a48847584db63cff0d9d196", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "0d069b424e703d1e7e79bc1cba46b6e51c0d915847ba88612add8117bf4239ed", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-riscv64" + "sha256": "29ba4c5fc8eb53e2fa2d0327c640c6a727086fd7efae79da47bf0a82bde290f3", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "8d7b4b5e61a7659d14a5cc2d16c6e2119b7113af1858b4879a7463707eee24ca", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-s390x" + "sha256": "078f555e41e7c2d37d47f81cffd6b80d77288ba562bee19ac00215205edca278", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe" + "sha256": "e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "d622f50e48d0565c1d3ab8c410ef7287a9efe0cf2b2c803ff7878918592e27bf", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-aarch64.exe" + "sha256": "3ed47ab4d1cd56d63981246820420e7aaf042f2a48e6ccc95993872980a4e0a9", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-aarch64.exe" } }, - "version": "5.7.0" + "version": "5.7.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From 5d8911100c2e774bf80a206707bf26603bf43f62 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 11 Nov 2026 02:05:39 -0800 Subject: [PATCH 659/667] Update 29-rc to compose 5.7.1 --- 29-rc/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 4250919fb..cd3d5103b 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -116,38 +116,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.7.0 +ENV DOCKER_COMPOSE_VERSION 5.7.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-x86_64'; \ - sha256='7758048ad38e580f22559603312874fec8bb638d021a9e64182385fc17cc12a2'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-x86_64'; \ + sha256='af426722a8af5de812fcee30cc1c39f0639f5f723cbadefb25e5d4db054064cf'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv6'; \ - sha256='1d6589e2a9d6c6d5ad8e53491ea9e07cb8be45d6cbd44ba5575f38ada2dd5998'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv6'; \ + sha256='923137699688e7ea1aade66c16b9a1d475150487ccc99636d0f1de3ce46e6107'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv7'; \ - sha256='d18e5c549fd3595b36846fe00d01e2af5a37d4baec7945c557a0abda9af63c91'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv7'; \ + sha256='c03e0c93cf747f311d39f6920a33c461fd0f7a6246439aaf259766527caa28f5'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-aarch64'; \ - sha256='15861535d14e26555736b49376c95e14bfd94285366c8446bfac7156a972e76f'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-aarch64'; \ + sha256='f2f49f903240895fa764c0dca3a14548b754ad9426f6b609ccaf55ec5a3aa2a5'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-ppc64le'; \ - sha256='2f47de2439791611614ca3d23c1c4daf76f3842f2dca7d0b21c20cb1abb09557'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-ppc64le'; \ + sha256='e41bf397abf7fc7a1cd35a039676067e6fc36d022a48847584db63cff0d9d196'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-riscv64'; \ - sha256='0d069b424e703d1e7e79bc1cba46b6e51c0d915847ba88612add8117bf4239ed'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-riscv64'; \ + sha256='29ba4c5fc8eb53e2fa2d0327c640c6a727086fd7efae79da47bf0a82bde290f3'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-s390x'; \ - sha256='8d7b4b5e61a7659d14a5cc2d16c6e2119b7113af1858b4879a7463707eee24ca'; \ + url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-s390x'; \ + sha256='078f555e41e7c2d37d47f81cffd6b80d77288ba562bee19ac00215205edca278'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index 0f6a7f5fd..f8829658b 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -65,9 +65,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.7.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f +ENV DOCKER_COMPOSE_VERSION 5.7.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 1518e5861..10da82ecf 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -65,9 +65,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.7.0 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f +ENV DOCKER_COMPOSE_VERSION 5.7.1 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index c34eca186..21833e757 100644 --- a/versions.json +++ b/versions.json @@ -308,61 +308,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "7758048ad38e580f22559603312874fec8bb638d021a9e64182385fc17cc12a2", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-x86_64" + "sha256": "af426722a8af5de812fcee30cc1c39f0639f5f723cbadefb25e5d4db054064cf", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "1d6589e2a9d6c6d5ad8e53491ea9e07cb8be45d6cbd44ba5575f38ada2dd5998", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv6" + "sha256": "923137699688e7ea1aade66c16b9a1d475150487ccc99636d0f1de3ce46e6107", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "d18e5c549fd3595b36846fe00d01e2af5a37d4baec7945c557a0abda9af63c91", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-armv7" + "sha256": "c03e0c93cf747f311d39f6920a33c461fd0f7a6246439aaf259766527caa28f5", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "15861535d14e26555736b49376c95e14bfd94285366c8446bfac7156a972e76f", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-aarch64" + "sha256": "f2f49f903240895fa764c0dca3a14548b754ad9426f6b609ccaf55ec5a3aa2a5", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "f57fad1fc3a942309b76da99e0a1c49dc97f7c56d4a03593d71bb01577aeeb29", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-darwin-x86_64" + "sha256": "c28b37c7bf1cc315acdf511c2c0f34ce19d4d33b6038611617063a99c45417c6", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "54495ff81dd8cae11861455f0308a293a530149beba8f1d90ff3f295b11cf035", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-darwin-aarch64" + "sha256": "5a9aa8b5fb5b1e3cd83f39c80e570ae30aafd74cd9b47264fbe4ff7e6e6251ca", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "2f47de2439791611614ca3d23c1c4daf76f3842f2dca7d0b21c20cb1abb09557", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-ppc64le" + "sha256": "e41bf397abf7fc7a1cd35a039676067e6fc36d022a48847584db63cff0d9d196", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "0d069b424e703d1e7e79bc1cba46b6e51c0d915847ba88612add8117bf4239ed", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-riscv64" + "sha256": "29ba4c5fc8eb53e2fa2d0327c640c6a727086fd7efae79da47bf0a82bde290f3", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "8d7b4b5e61a7659d14a5cc2d16c6e2119b7113af1858b4879a7463707eee24ca", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-linux-s390x" + "sha256": "078f555e41e7c2d37d47f81cffd6b80d77288ba562bee19ac00215205edca278", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "f5dc759702aec5c0602e247aa861d14853216e3f481c4eaaf83621a035ecf92f", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-x86_64.exe" + "sha256": "e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "d622f50e48d0565c1d3ab8c410ef7287a9efe0cf2b2c803ff7878918592e27bf", - "url": "https://github.com/docker/compose/releases/download/v5.7.0/docker-compose-windows-aarch64.exe" + "sha256": "3ed47ab4d1cd56d63981246820420e7aaf042f2a48e6ccc95993872980a4e0a9", + "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-aarch64.exe" } }, - "version": "5.7.0" + "version": "5.7.1" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From bd854126607fe24e775a4a4b9cb30243b74c3a36 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 11 Nov 2026 20:04:13 -0800 Subject: [PATCH 660/667] Update 29 to buildx 0.39.0 --- 29/cli/Dockerfile | 30 ++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 104 +++++++++--------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 451d29346..b69464887 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -57,38 +57,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.38.2 +ENV DOCKER_BUILDX_VERSION 0.39.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-amd64'; \ - sha256='7992ec09413b80ff57ba4e081f56fc833d7bac1d5e71143c6c809e7e6065f6d6'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-amd64'; \ + sha256='5fb31a097304fbf6dd4038649a0decf32c2b9510e4047acd7d68b9d700c46194'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v6'; \ - sha256='47c3eba42d0c55c5843193b3393ffb32dce4c266585232ead6d99a2c5480896c'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v6'; \ + sha256='462b5699af263c05c5c1d973ab33f41810c263585d5b8b3dcfa6f7d3a11bc987'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v7'; \ - sha256='fb8c234f236baabe1f756fe5a0d68d39b58173fa96b38fc73fc4e5a0b78f9e49'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v7'; \ + sha256='a49d315f68f6ed91b2ea88da4259b418abe015be68460e0eebe0b8d9f74970b1'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm64'; \ - sha256='46c0f334772de3cb0b341cc415caf7339fb5cfc8b8438ebcb5a10e7f23800d36'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm64'; \ + sha256='722cdcdfdd6f3fb943fa1ba75102d057feb18ba72aab93b1b0a8cf2b2b48a25f'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-ppc64le'; \ - sha256='695822f3edbec94790fecc2d5d98de18733317a9b47b2cd76ebc150c4db09bad'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-ppc64le'; \ + sha256='dd7b1f65b7432229a619d3b92ddbdd742fb26fa8b4a281a99489431ef5e041b7'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-riscv64'; \ - sha256='b5333f39daeefdcc4f7e37e6c2ce82a116ca21714f3d14a0d1c77ccb7f2cb1a7'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-riscv64'; \ + sha256='58d328fe5a8e58f4e5934913c1f7c51d6633f197d28f3114fe2cb9026cfb5d74'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-s390x'; \ - sha256='fe1855c35f148aa9d84ebdc6e89af4f4173cf00c6672d799a607ed4177bfea4c'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-s390x'; \ + sha256='754f15a88f4496b5ddea3ac5626dd068f836965f799253a6402b07d324c45892'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index d5b67eeb9..6eaf9e36b 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.38.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0 +ENV DOCKER_BUILDX_VERSION 0.39.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 5bba2606b..61d9c2df9 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.38.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0 +ENV DOCKER_BUILDX_VERSION 0.39.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 21833e757..bac924b54 100644 --- a/versions.json +++ b/versions.json @@ -22,92 +22,92 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.38.2.linux-amd64", - "sha256": "7992ec09413b80ff57ba4e081f56fc833d7bac1d5e71143c6c809e7e6065f6d6", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-amd64" + "file": "buildx-v0.39.0.linux-amd64", + "sha256": "5fb31a097304fbf6dd4038649a0decf32c2b9510e4047acd7d68b9d700c46194", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.38.2.linux-arm-v6", - "sha256": "47c3eba42d0c55c5843193b3393ffb32dce4c266585232ead6d99a2c5480896c", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v6" + "file": "buildx-v0.39.0.linux-arm-v6", + "sha256": "462b5699af263c05c5c1d973ab33f41810c263585d5b8b3dcfa6f7d3a11bc987", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.38.2.linux-arm-v7", - "sha256": "fb8c234f236baabe1f756fe5a0d68d39b58173fa96b38fc73fc4e5a0b78f9e49", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v7" + "file": "buildx-v0.39.0.linux-arm-v7", + "sha256": "a49d315f68f6ed91b2ea88da4259b418abe015be68460e0eebe0b8d9f74970b1", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.38.2.linux-arm64", - "sha256": "46c0f334772de3cb0b341cc415caf7339fb5cfc8b8438ebcb5a10e7f23800d36", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm64" + "file": "buildx-v0.39.0.linux-arm64", + "sha256": "722cdcdfdd6f3fb943fa1ba75102d057feb18ba72aab93b1b0a8cf2b2b48a25f", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.38.2.darwin-amd64", - "sha256": "ad2418546e6d168a3e3b59fdf2a24997bc84263abeb4a5d9d0422cfe782743fc", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.darwin-amd64" + "file": "buildx-v0.39.0.darwin-amd64", + "sha256": "dda7fe88c8ac15ebc4fd57c452ee3ba44336967c74221a0b229b6cff68bec538", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.38.2.darwin-arm64", - "sha256": "81702e18713cfd495bfe594943fa57f470eda16c0653ae3de15cd411df273c41", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.darwin-arm64" + "file": "buildx-v0.39.0.darwin-arm64", + "sha256": "0190e4b9c85510974290f9a597e86c4d8200be782aeaa3df7d756ab4423d6b2d", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.38.2.freebsd-amd64", - "sha256": "d7db8b1de20b1a089ae5fd5b6f2b599098ef4082bc7c05fab91a668691d6d686", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.freebsd-amd64" + "file": "buildx-v0.39.0.freebsd-amd64", + "sha256": "e9c558170bd90fa64624a2fb8be3fe49c19ff20179ff9ca90e158be1c0a5a1b1", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.38.2.freebsd-arm64", - "sha256": "98ebc419f2109bc3a9bc882119a6783c53adff0394841902912faf211e6ef386", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.freebsd-arm64" + "file": "buildx-v0.39.0.freebsd-arm64", + "sha256": "e675fd6288733fcba8e2fb83f5dea7b2eb6b9d5ed113a014c691ba53ba22a7da", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.38.2.netbsd-amd64", - "sha256": "a62e4f0df71d5d91c8db5f500db28df30540030b8f20e3d945413059b35884c2", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.netbsd-amd64" + "file": "buildx-v0.39.0.netbsd-amd64", + "sha256": "ff57e8f0e579310eecd83932711e70caba71e77032d3fd5c30c28b8879c5f6ff", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.38.2.netbsd-arm64", - "sha256": "07a3a6bbc9bb695b2fb6642bae306655801f8befa11b1b3e8cde7c39f59bda0d", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.netbsd-arm64" + "file": "buildx-v0.39.0.netbsd-arm64", + "sha256": "4a719008779ca3c8c9422efbca191ee12edfad33775b0c15d8cd4cd6a8b0a5b4", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.38.2.openbsd-amd64", - "sha256": "5f96af1dc3c326d57543ae2155dc9915e16cc0aa0ca48fab1373b44cc55498ce", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.openbsd-amd64" + "file": "buildx-v0.39.0.openbsd-amd64", + "sha256": "02be7ee1aa2ec4925699197c23a85237f57ec4432e21d159744004ed5532566c", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.38.2.openbsd-arm64", - "sha256": "4885cdcc2e2906eb2cb4192d2526c992a36e7767b5c3e0f8cd8f07703f0a5213", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.openbsd-arm64" + "file": "buildx-v0.39.0.openbsd-arm64", + "sha256": "cc049d24dd236e9ad5816fc8747958d35ea2a2dc5876650cfeb16a64879461d4", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.38.2.linux-ppc64le", - "sha256": "695822f3edbec94790fecc2d5d98de18733317a9b47b2cd76ebc150c4db09bad", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-ppc64le" + "file": "buildx-v0.39.0.linux-ppc64le", + "sha256": "dd7b1f65b7432229a619d3b92ddbdd742fb26fa8b4a281a99489431ef5e041b7", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.38.2.linux-riscv64", - "sha256": "b5333f39daeefdcc4f7e37e6c2ce82a116ca21714f3d14a0d1c77ccb7f2cb1a7", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-riscv64" + "file": "buildx-v0.39.0.linux-riscv64", + "sha256": "58d328fe5a8e58f4e5934913c1f7c51d6633f197d28f3114fe2cb9026cfb5d74", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.38.2.linux-s390x", - "sha256": "fe1855c35f148aa9d84ebdc6e89af4f4173cf00c6672d799a607ed4177bfea4c", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-s390x" + "file": "buildx-v0.39.0.linux-s390x", + "sha256": "754f15a88f4496b5ddea3ac5626dd068f836965f799253a6402b07d324c45892", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.38.2.windows-amd64.exe", - "sha256": "9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe" + "file": "buildx-v0.39.0.windows-amd64.exe", + "sha256": "b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.38.2.windows-arm64.exe", - "sha256": "07b564aa6a6a88d65c52f538066f25ad2ea3140bc1d7de523fe083ca8cbcbc5b", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-arm64.exe" + "file": "buildx-v0.39.0.windows-arm64.exe", + "sha256": "95987aac9f3b9833e12ca7de963416d403e1e1dc7b7c974c165f2ecb1a587868", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-arm64.exe" } }, - "version": "0.38.2" + "version": "0.39.0" }, "compose": { "arches": { From 619d5a1c379c93c0a99316db431972dcea904263 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 11 Nov 2026 20:06:02 -0800 Subject: [PATCH 661/667] Update 29-rc to buildx 0.39.0 --- 29-rc/cli/Dockerfile | 30 ++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 104 +++++++++--------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index cd3d5103b..8112e973f 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -70,38 +70,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.38.2 +ENV DOCKER_BUILDX_VERSION 0.39.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-amd64'; \ - sha256='7992ec09413b80ff57ba4e081f56fc833d7bac1d5e71143c6c809e7e6065f6d6'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-amd64'; \ + sha256='5fb31a097304fbf6dd4038649a0decf32c2b9510e4047acd7d68b9d700c46194'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v6'; \ - sha256='47c3eba42d0c55c5843193b3393ffb32dce4c266585232ead6d99a2c5480896c'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v6'; \ + sha256='462b5699af263c05c5c1d973ab33f41810c263585d5b8b3dcfa6f7d3a11bc987'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v7'; \ - sha256='fb8c234f236baabe1f756fe5a0d68d39b58173fa96b38fc73fc4e5a0b78f9e49'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v7'; \ + sha256='a49d315f68f6ed91b2ea88da4259b418abe015be68460e0eebe0b8d9f74970b1'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm64'; \ - sha256='46c0f334772de3cb0b341cc415caf7339fb5cfc8b8438ebcb5a10e7f23800d36'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm64'; \ + sha256='722cdcdfdd6f3fb943fa1ba75102d057feb18ba72aab93b1b0a8cf2b2b48a25f'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-ppc64le'; \ - sha256='695822f3edbec94790fecc2d5d98de18733317a9b47b2cd76ebc150c4db09bad'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-ppc64le'; \ + sha256='dd7b1f65b7432229a619d3b92ddbdd742fb26fa8b4a281a99489431ef5e041b7'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-riscv64'; \ - sha256='b5333f39daeefdcc4f7e37e6c2ce82a116ca21714f3d14a0d1c77ccb7f2cb1a7'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-riscv64'; \ + sha256='58d328fe5a8e58f4e5934913c1f7c51d6633f197d28f3114fe2cb9026cfb5d74'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-s390x'; \ - sha256='fe1855c35f148aa9d84ebdc6e89af4f4173cf00c6672d799a607ed4177bfea4c'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-s390x'; \ + sha256='754f15a88f4496b5ddea3ac5626dd068f836965f799253a6402b07d324c45892'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index f8829658b..a52e00456 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -44,9 +44,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.38.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0 +ENV DOCKER_BUILDX_VERSION 0.39.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 10da82ecf..8e02f5851 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -44,9 +44,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.38.2 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0 +ENV DOCKER_BUILDX_VERSION 0.39.0 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index bac924b54..753622513 100644 --- a/versions.json +++ b/versions.json @@ -217,92 +217,92 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.38.2.linux-amd64", - "sha256": "7992ec09413b80ff57ba4e081f56fc833d7bac1d5e71143c6c809e7e6065f6d6", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-amd64" + "file": "buildx-v0.39.0.linux-amd64", + "sha256": "5fb31a097304fbf6dd4038649a0decf32c2b9510e4047acd7d68b9d700c46194", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.38.2.linux-arm-v6", - "sha256": "47c3eba42d0c55c5843193b3393ffb32dce4c266585232ead6d99a2c5480896c", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v6" + "file": "buildx-v0.39.0.linux-arm-v6", + "sha256": "462b5699af263c05c5c1d973ab33f41810c263585d5b8b3dcfa6f7d3a11bc987", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.38.2.linux-arm-v7", - "sha256": "fb8c234f236baabe1f756fe5a0d68d39b58173fa96b38fc73fc4e5a0b78f9e49", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm-v7" + "file": "buildx-v0.39.0.linux-arm-v7", + "sha256": "a49d315f68f6ed91b2ea88da4259b418abe015be68460e0eebe0b8d9f74970b1", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.38.2.linux-arm64", - "sha256": "46c0f334772de3cb0b341cc415caf7339fb5cfc8b8438ebcb5a10e7f23800d36", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-arm64" + "file": "buildx-v0.39.0.linux-arm64", + "sha256": "722cdcdfdd6f3fb943fa1ba75102d057feb18ba72aab93b1b0a8cf2b2b48a25f", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.38.2.darwin-amd64", - "sha256": "ad2418546e6d168a3e3b59fdf2a24997bc84263abeb4a5d9d0422cfe782743fc", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.darwin-amd64" + "file": "buildx-v0.39.0.darwin-amd64", + "sha256": "dda7fe88c8ac15ebc4fd57c452ee3ba44336967c74221a0b229b6cff68bec538", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.38.2.darwin-arm64", - "sha256": "81702e18713cfd495bfe594943fa57f470eda16c0653ae3de15cd411df273c41", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.darwin-arm64" + "file": "buildx-v0.39.0.darwin-arm64", + "sha256": "0190e4b9c85510974290f9a597e86c4d8200be782aeaa3df7d756ab4423d6b2d", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.38.2.freebsd-amd64", - "sha256": "d7db8b1de20b1a089ae5fd5b6f2b599098ef4082bc7c05fab91a668691d6d686", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.freebsd-amd64" + "file": "buildx-v0.39.0.freebsd-amd64", + "sha256": "e9c558170bd90fa64624a2fb8be3fe49c19ff20179ff9ca90e158be1c0a5a1b1", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.38.2.freebsd-arm64", - "sha256": "98ebc419f2109bc3a9bc882119a6783c53adff0394841902912faf211e6ef386", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.freebsd-arm64" + "file": "buildx-v0.39.0.freebsd-arm64", + "sha256": "e675fd6288733fcba8e2fb83f5dea7b2eb6b9d5ed113a014c691ba53ba22a7da", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.38.2.netbsd-amd64", - "sha256": "a62e4f0df71d5d91c8db5f500db28df30540030b8f20e3d945413059b35884c2", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.netbsd-amd64" + "file": "buildx-v0.39.0.netbsd-amd64", + "sha256": "ff57e8f0e579310eecd83932711e70caba71e77032d3fd5c30c28b8879c5f6ff", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.38.2.netbsd-arm64", - "sha256": "07a3a6bbc9bb695b2fb6642bae306655801f8befa11b1b3e8cde7c39f59bda0d", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.netbsd-arm64" + "file": "buildx-v0.39.0.netbsd-arm64", + "sha256": "4a719008779ca3c8c9422efbca191ee12edfad33775b0c15d8cd4cd6a8b0a5b4", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.38.2.openbsd-amd64", - "sha256": "5f96af1dc3c326d57543ae2155dc9915e16cc0aa0ca48fab1373b44cc55498ce", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.openbsd-amd64" + "file": "buildx-v0.39.0.openbsd-amd64", + "sha256": "02be7ee1aa2ec4925699197c23a85237f57ec4432e21d159744004ed5532566c", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.38.2.openbsd-arm64", - "sha256": "4885cdcc2e2906eb2cb4192d2526c992a36e7767b5c3e0f8cd8f07703f0a5213", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.openbsd-arm64" + "file": "buildx-v0.39.0.openbsd-arm64", + "sha256": "cc049d24dd236e9ad5816fc8747958d35ea2a2dc5876650cfeb16a64879461d4", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.38.2.linux-ppc64le", - "sha256": "695822f3edbec94790fecc2d5d98de18733317a9b47b2cd76ebc150c4db09bad", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-ppc64le" + "file": "buildx-v0.39.0.linux-ppc64le", + "sha256": "dd7b1f65b7432229a619d3b92ddbdd742fb26fa8b4a281a99489431ef5e041b7", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.38.2.linux-riscv64", - "sha256": "b5333f39daeefdcc4f7e37e6c2ce82a116ca21714f3d14a0d1c77ccb7f2cb1a7", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-riscv64" + "file": "buildx-v0.39.0.linux-riscv64", + "sha256": "58d328fe5a8e58f4e5934913c1f7c51d6633f197d28f3114fe2cb9026cfb5d74", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-riscv64" }, "s390x": { - "file": "buildx-v0.38.2.linux-s390x", - "sha256": "fe1855c35f148aa9d84ebdc6e89af4f4173cf00c6672d799a607ed4177bfea4c", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.linux-s390x" + "file": "buildx-v0.39.0.linux-s390x", + "sha256": "754f15a88f4496b5ddea3ac5626dd068f836965f799253a6402b07d324c45892", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.38.2.windows-amd64.exe", - "sha256": "9a6aca9c84adda0391d1d98d8b74b49359cad1bcdadd196a0a5d7d5dc4cf15e0", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-amd64.exe" + "file": "buildx-v0.39.0.windows-amd64.exe", + "sha256": "b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.38.2.windows-arm64.exe", - "sha256": "07b564aa6a6a88d65c52f538066f25ad2ea3140bc1d7de523fe083ca8cbcbc5b", - "url": "https://github.com/docker/buildx/releases/download/v0.38.2/buildx-v0.38.2.windows-arm64.exe" + "file": "buildx-v0.39.0.windows-arm64.exe", + "sha256": "95987aac9f3b9833e12ca7de963416d403e1e1dc7b7c974c165f2ecb1a587868", + "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-arm64.exe" } }, - "version": "0.38.2" + "version": "0.39.0" }, "compose": { "arches": { From 30b1d9d9bafbef90a12e1bb6d56c2fbad309e905 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 12 Nov 2026 14:04:20 -0800 Subject: [PATCH 662/667] Update 29-rc to 29.10.0-rc.2 --- 29-rc/cli/Dockerfile | 26 ++++++------- 29-rc/dind-rootless/Dockerfile | 8 ++-- 29-rc/dind/Dockerfile | 24 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 38 +++++++++---------- 6 files changed, 54 insertions(+), 54 deletions(-) diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile index 8112e973f..1a63e8984 100644 --- a/29-rc/cli/Dockerfile +++ b/29-rc/cli/Dockerfile @@ -23,35 +23,35 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.10.0-rc.1 +ENV DOCKER_VERSION 29.10.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.1.tgz'; \ - sha256='d023bcab935f045548c5df79ea96d1f3fccbc091cf9a8347139154859f4767b8'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.2.tgz'; \ + sha256='f6960ea6a13bbac1a4bfdde08b13d937753d82dd083d8f29a5f855e4d157e1ee'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.1.tgz'; \ - sha256='55aedd3f6b42d8dd3e397358f0ca4fb321cb89cce325b9a239842866ecee3f8f'; \ + url='https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.2.tgz'; \ + sha256='69caab6e31d38ab4a0bfc2161d7284ea54d69a6f7d92747f03018d761ffd89f7'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.1.tgz'; \ - sha256='d244956ea5ba6b9ca88acd24b6cc67ee5bd56c39f1d870a8d317ec472b0cc223'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.2.tgz'; \ + sha256='f0585679cc4214a6ba3c71a8def4386808de14e24b9d05f3a64e9e0107a7ae86'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.1.tgz'; \ - sha256='48348b68501015c3d9cc2c2a0344588eb0676cf68c38dd4ffd881a75e2d8662c'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.2.tgz'; \ + sha256='cb4a05dd5a1f3f9812e7f2d122fdd8bea30cc182b98d9559a013573f2443474c'; \ ;; \ 'ppc64le') \ - url='https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.1.tgz'; \ - sha256='1db34bee3e77a4af021631a5492b9385c3aafedd1b2aa3f693a60ca6760a3315'; \ + url='https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.2.tgz'; \ + sha256='b075ac18d0323a28e9189dcdbf1a8875803ff2cda55899041dddbed238ebbdfc'; \ ;; \ 's390x') \ - url='https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.1.tgz'; \ - sha256='78546fc2dcf04c7844e3e3f54b05485da64c852fceee453f2c8bac7b4ecd896b'; \ + url='https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.2.tgz'; \ + sha256='bf396b9a56b35e9bdc7c7b4eaa0049b4b4d9e82684e9317921763d5c4790cf1c'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile index 93e4eda43..1f18d8601 100644 --- a/29-rc/dind-rootless/Dockerfile +++ b/29-rc/dind-rootless/Dockerfile @@ -26,12 +26,12 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.10.0-rc.1.tgz'; \ - sha256='e63ea3c6e4a28575be61bae88303b335c9637198d79a1b1aaae17ad0f955abc9'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.10.0-rc.2.tgz'; \ + sha256='6770d56b342c26542aabbc32fd27e1848aa6b53f840dc61a6c35342aefa08cfc'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.10.0-rc.1.tgz'; \ - sha256='2db6e2f180b66a4b5f6555f56041c85e55537230aaf939fdf18d60e1cea59c9e'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.10.0-rc.2.tgz'; \ + sha256='8f215560516e21c1bad7bc0dafd220e86bfef141060725d2b5263ac3426558ca'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile index a9331210f..12d09257c 100644 --- a/29-rc/dind/Dockerfile +++ b/29-rc/dind/Dockerfile @@ -56,28 +56,28 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.1.tgz'; \ - sha256='d023bcab935f045548c5df79ea96d1f3fccbc091cf9a8347139154859f4767b8'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.2.tgz'; \ + sha256='f6960ea6a13bbac1a4bfdde08b13d937753d82dd083d8f29a5f855e4d157e1ee'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.1.tgz'; \ - sha256='55aedd3f6b42d8dd3e397358f0ca4fb321cb89cce325b9a239842866ecee3f8f'; \ + url='https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.2.tgz'; \ + sha256='69caab6e31d38ab4a0bfc2161d7284ea54d69a6f7d92747f03018d761ffd89f7'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.1.tgz'; \ - sha256='d244956ea5ba6b9ca88acd24b6cc67ee5bd56c39f1d870a8d317ec472b0cc223'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.2.tgz'; \ + sha256='f0585679cc4214a6ba3c71a8def4386808de14e24b9d05f3a64e9e0107a7ae86'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.1.tgz'; \ - sha256='48348b68501015c3d9cc2c2a0344588eb0676cf68c38dd4ffd881a75e2d8662c'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.2.tgz'; \ + sha256='cb4a05dd5a1f3f9812e7f2d122fdd8bea30cc182b98d9559a013573f2443474c'; \ ;; \ 'ppc64le') \ - url='https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.1.tgz'; \ - sha256='1db34bee3e77a4af021631a5492b9385c3aafedd1b2aa3f693a60ca6760a3315'; \ + url='https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.2.tgz'; \ + sha256='b075ac18d0323a28e9189dcdbf1a8875803ff2cda55899041dddbed238ebbdfc'; \ ;; \ 's390x') \ - url='https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.1.tgz'; \ - sha256='78546fc2dcf04c7844e3e3f54b05485da64c852fceee453f2c8bac7b4ecd896b'; \ + url='https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.2.tgz'; \ + sha256='bf396b9a56b35e9bdc7c7b4eaa0049b4b4d9e82684e9317921763d5c4790cf1c'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile index a52e00456..6c126a8d1 100644 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -15,9 +15,9 @@ 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 29.10.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.1.zip -ENV DOCKER_SHA256 d3f21d8d1487ee8a0bc936cb65c5149b1f5bebe2d05499c6bcfdcd8b81030c7b +ENV DOCKER_VERSION 29.10.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.2.zip +ENV DOCKER_SHA256 1c9067b9ff433a94ff85507e5ba822936cfac615861684f76bc8cae6edc72451 RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile index 8e02f5851..c230b9f95 100644 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -15,9 +15,9 @@ 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 29.10.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.1.zip -ENV DOCKER_SHA256 d3f21d8d1487ee8a0bc936cb65c5149b1f5bebe2d05499c6bcfdcd8b81030c7b +ENV DOCKER_VERSION 29.10.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.2.zip +ENV DOCKER_SHA256 1c9067b9ff433a94ff85507e5ba822936cfac615861684f76bc8cae6edc72451 RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ diff --git a/versions.json b/versions.json index 753622513..00c01af25 100644 --- a/versions.json +++ b/versions.json @@ -182,36 +182,36 @@ "29-rc": { "arches": { "amd64": { - "dockerSha256": "d023bcab935f045548c5df79ea96d1f3fccbc091cf9a8347139154859f4767b8", - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.1.tgz", - "rootlessExtrasSha256": "e63ea3c6e4a28575be61bae88303b335c9637198d79a1b1aaae17ad0f955abc9", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.10.0-rc.1.tgz" + "dockerSha256": "f6960ea6a13bbac1a4bfdde08b13d937753d82dd083d8f29a5f855e4d157e1ee", + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.2.tgz", + "rootlessExtrasSha256": "6770d56b342c26542aabbc32fd27e1848aa6b53f840dc61a6c35342aefa08cfc", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.10.0-rc.2.tgz" }, "arm32v6": { - "dockerSha256": "55aedd3f6b42d8dd3e397358f0ca4fb321cb89cce325b9a239842866ecee3f8f", - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.1.tgz" + "dockerSha256": "69caab6e31d38ab4a0bfc2161d7284ea54d69a6f7d92747f03018d761ffd89f7", + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.2.tgz" }, "arm32v7": { - "dockerSha256": "d244956ea5ba6b9ca88acd24b6cc67ee5bd56c39f1d870a8d317ec472b0cc223", - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.1.tgz" + "dockerSha256": "f0585679cc4214a6ba3c71a8def4386808de14e24b9d05f3a64e9e0107a7ae86", + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.2.tgz" }, "arm64v8": { - "dockerSha256": "48348b68501015c3d9cc2c2a0344588eb0676cf68c38dd4ffd881a75e2d8662c", - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.1.tgz", - "rootlessExtrasSha256": "2db6e2f180b66a4b5f6555f56041c85e55537230aaf939fdf18d60e1cea59c9e", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.10.0-rc.1.tgz" + "dockerSha256": "cb4a05dd5a1f3f9812e7f2d122fdd8bea30cc182b98d9559a013573f2443474c", + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.2.tgz", + "rootlessExtrasSha256": "8f215560516e21c1bad7bc0dafd220e86bfef141060725d2b5263ac3426558ca", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.10.0-rc.2.tgz" }, "ppc64le": { - "dockerSha256": "1db34bee3e77a4af021631a5492b9385c3aafedd1b2aa3f693a60ca6760a3315", - "dockerUrl": "https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.1.tgz" + "dockerSha256": "b075ac18d0323a28e9189dcdbf1a8875803ff2cda55899041dddbed238ebbdfc", + "dockerUrl": "https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.2.tgz" }, "s390x": { - "dockerSha256": "78546fc2dcf04c7844e3e3f54b05485da64c852fceee453f2c8bac7b4ecd896b", - "dockerUrl": "https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.1.tgz" + "dockerSha256": "bf396b9a56b35e9bdc7c7b4eaa0049b4b4d9e82684e9317921763d5c4790cf1c", + "dockerUrl": "https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.2.tgz" }, "windows-amd64": { - "dockerSha256": "d3f21d8d1487ee8a0bc936cb65c5149b1f5bebe2d05499c6bcfdcd8b81030c7b", - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.1.zip" + "dockerSha256": "1c9067b9ff433a94ff85507e5ba822936cfac615861684f76bc8cae6edc72451", + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.2.zip" } }, "buildx": { @@ -372,6 +372,6 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.10.0-rc.1" + "version": "29.10.0-rc.2" } } From 70cd6b52204a3bf037510cb750e099c34b081bd4 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 16 Nov 2026 08:04:15 -0800 Subject: [PATCH 663/667] Update 29 to 29.10.0 --- 29/cli/Dockerfile | 23 +++++++++++--- 29/dind-rootless/Dockerfile | 6 ++-- 29/dind/Dockerfile | 21 ++++++++++--- .../windowsservercore-ltsc2022/Dockerfile | 14 ++++++--- .../windowsservercore-ltsc2025/Dockerfile | 14 ++++++--- versions.json | 31 ++++++++++++++----- 6 files changed, 80 insertions(+), 29 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index b69464887..458b8b686 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -23,28 +23,41 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 29.9.3 +ENV DOCKER_VERSION 29.10.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.10.0.tgz'; \ + sha256='7c1ebadc65c716cdc6d35fc78759ed0e4317debf43c21dd12f066f2006999def'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.9.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.10.0.tgz'; \ + sha256='b3e626f7560728eb601687da86c27edf9b7dd71f6a0f00737baeeb607c0f1d68'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.10.0.tgz'; \ + sha256='08757af1f923c25d170211a1de8acc4e69e9cfbe7b5af63dd787afe2057efd5f'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.10.0.tgz'; \ + sha256='6e5159e8b5615e0c0c2954a2a1a2a12bc65f5d9b603595dba24a10cb367408cd'; \ + ;; \ + 'ppc64le') \ + url='https://download.docker.com/linux/static/stable/ppc64le/docker-29.10.0.tgz'; \ + sha256='f07fe44072d1614de38effa6492f840653dfbf9e5a7d3a0a1dab4c2dad257190'; \ + ;; \ + 's390x') \ + url='https://download.docker.com/linux/static/stable/s390x/docker-29.10.0.tgz'; \ + sha256='09c4a2ec475121fe9c1485c65e9f54f1fa20aa4d68d0c4b271005db3943a763b'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ \ wget -O 'docker.tgz' "$url"; \ + echo "$sha256 *"'docker.tgz' | sha256sum -c -; \ \ tar --extract \ --file docker.tgz \ diff --git a/29/dind-rootless/Dockerfile b/29/dind-rootless/Dockerfile index 4d110a254..14c7b650e 100644 --- a/29/dind-rootless/Dockerfile +++ b/29/dind-rootless/Dockerfile @@ -26,10 +26,12 @@ 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-29.9.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.10.0.tgz'; \ + sha256='a4ad65be3921ac3e45f3fe69893f5edbd078cb3b4a6499fe13288053553dce25'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.10.0.tgz'; \ + sha256='6d08caae6a61e58f86c21dc94bcbf87f2b7a82bb634ef051243004a7f92f9e07'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/29/dind/Dockerfile b/29/dind/Dockerfile index f23d1ca19..257e27f25 100644 --- a/29/dind/Dockerfile +++ b/29/dind/Dockerfile @@ -56,21 +56,34 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/stable/x86_64/docker-29.9.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/x86_64/docker-29.10.0.tgz'; \ + sha256='7c1ebadc65c716cdc6d35fc78759ed0e4317debf43c21dd12f066f2006999def'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/stable/armel/docker-29.9.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armel/docker-29.10.0.tgz'; \ + sha256='b3e626f7560728eb601687da86c27edf9b7dd71f6a0f00737baeeb607c0f1d68'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/stable/armhf/docker-29.9.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/armhf/docker-29.10.0.tgz'; \ + sha256='08757af1f923c25d170211a1de8acc4e69e9cfbe7b5af63dd787afe2057efd5f'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/stable/aarch64/docker-29.9.3.tgz'; \ + url='https://download.docker.com/linux/static/stable/aarch64/docker-29.10.0.tgz'; \ + sha256='6e5159e8b5615e0c0c2954a2a1a2a12bc65f5d9b603595dba24a10cb367408cd'; \ + ;; \ + 'ppc64le') \ + url='https://download.docker.com/linux/static/stable/ppc64le/docker-29.10.0.tgz'; \ + sha256='f07fe44072d1614de38effa6492f840653dfbf9e5a7d3a0a1dab4c2dad257190'; \ + ;; \ + 's390x') \ + url='https://download.docker.com/linux/static/stable/s390x/docker-29.10.0.tgz'; \ + sha256='09c4a2ec475121fe9c1485c65e9f54f1fa20aa4d68d0c4b271005db3943a763b'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ \ wget -O 'docker.tgz' "$url"; \ + echo "$sha256 *"'docker.tgz' | sha256sum -c -; \ \ tar --extract \ --file docker.tgz \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 6eaf9e36b..2bd9ee819 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -15,15 +15,19 @@ 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 29.9.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.3.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) +ENV DOCKER_VERSION 29.10.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.10.0.zip +ENV DOCKER_SHA256 bb894f67d85155e635ce71980fb2cf587e71dad8c41cc145c42a0de5160b6561 RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_SHA256); \ + if ((Get-FileHash docker.zip -Algorithm sha256).Hash -ne $env:DOCKER_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ Write-Host 'Expanding ...'; \ Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ # (this archive has a "docker/..." directory in it already) diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 61d9c2df9..a395b91be 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -15,15 +15,19 @@ 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 29.9.3 -ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.9.3.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) +ENV DOCKER_VERSION 29.10.0 +ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.10.0.zip +ENV DOCKER_SHA256 bb894f67d85155e635ce71980fb2cf587e71dad8c41cc145c42a0de5160b6561 RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ \ + Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_SHA256); \ + if ((Get-FileHash docker.zip -Algorithm sha256).Hash -ne $env:DOCKER_SHA256) { \ + Write-Host 'FAILED!'; \ + exit 1; \ + }; \ + \ Write-Host 'Expanding ...'; \ Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ # (this archive has a "docker/..." directory in it already) diff --git a/versions.json b/versions.json index 00c01af25..215a54da1 100644 --- a/versions.json +++ b/versions.json @@ -2,21 +2,36 @@ "29": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.9.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.9.3.tgz" + "dockerSha256": "7c1ebadc65c716cdc6d35fc78759ed0e4317debf43c21dd12f066f2006999def", + "dockerUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-29.10.0.tgz", + "rootlessExtrasSha256": "a4ad65be3921ac3e45f3fe69893f5edbd078cb3b4a6499fe13288053553dce25", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.10.0.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.9.3.tgz" + "dockerSha256": "b3e626f7560728eb601687da86c27edf9b7dd71f6a0f00737baeeb607c0f1d68", + "dockerUrl": "https://download.docker.com/linux/static/stable/armel/docker-29.10.0.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.9.3.tgz" + "dockerSha256": "08757af1f923c25d170211a1de8acc4e69e9cfbe7b5af63dd787afe2057efd5f", + "dockerUrl": "https://download.docker.com/linux/static/stable/armhf/docker-29.10.0.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.9.3.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.9.3.tgz" + "dockerSha256": "6e5159e8b5615e0c0c2954a2a1a2a12bc65f5d9b603595dba24a10cb367408cd", + "dockerUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-29.10.0.tgz", + "rootlessExtrasSha256": "6d08caae6a61e58f86c21dc94bcbf87f2b7a82bb634ef051243004a7f92f9e07", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.10.0.tgz" + }, + "ppc64le": { + "dockerSha256": "f07fe44072d1614de38effa6492f840653dfbf9e5a7d3a0a1dab4c2dad257190", + "dockerUrl": "https://download.docker.com/linux/static/stable/ppc64le/docker-29.10.0.tgz" + }, + "s390x": { + "dockerSha256": "09c4a2ec475121fe9c1485c65e9f54f1fa20aa4d68d0c4b271005db3943a763b", + "dockerUrl": "https://download.docker.com/linux/static/stable/s390x/docker-29.10.0.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.9.3.zip" + "dockerSha256": "bb894f67d85155e635ce71980fb2cf587e71dad8c41cc145c42a0de5160b6561", + "dockerUrl": "https://download.docker.com/win/static/stable/x86_64/docker-29.10.0.zip" } }, "buildx": { @@ -177,7 +192,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "29.9.3" + "version": "29.10.0" }, "29-rc": { "arches": { From 659a5eb6060684721f405990557ea197e359f3a2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 16 Nov 2026 08:05:54 -0800 Subject: [PATCH 664/667] Update 29-rc --- 29-rc/cli/Dockerfile | 180 ------------- 29-rc/cli/docker-entrypoint.sh | 61 ----- 29-rc/cli/modprobe.sh | 20 -- 29-rc/dind-rootless/Dockerfile | 56 ----- 29-rc/dind/Dockerfile | 117 --------- 29-rc/dind/dockerd-entrypoint.sh | 238 ------------------ .../windowsservercore-ltsc2022/Dockerfile | 95 ------- .../windowsservercore-ltsc2025/Dockerfile | 95 ------- versions.json | 196 +-------------- 9 files changed, 1 insertion(+), 1057 deletions(-) delete mode 100644 29-rc/cli/Dockerfile delete mode 100755 29-rc/cli/docker-entrypoint.sh delete mode 100755 29-rc/cli/modprobe.sh delete mode 100644 29-rc/dind-rootless/Dockerfile delete mode 100644 29-rc/dind/Dockerfile delete mode 100755 29-rc/dind/dockerd-entrypoint.sh delete mode 100644 29-rc/windows/windowsservercore-ltsc2022/Dockerfile delete mode 100644 29-rc/windows/windowsservercore-ltsc2025/Dockerfile diff --git a/29-rc/cli/Dockerfile b/29-rc/cli/Dockerfile deleted file mode 100644 index 1a63e8984..000000000 --- a/29-rc/cli/Dockerfile +++ /dev/null @@ -1,180 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.24 - -RUN apk add --no-cache \ - ca-certificates \ -# DOCKER_HOST=ssh://... -- https://github.com/docker/cli/pull/1014 - openssh-client \ -# https://github.com/docker-library/docker/issues/482#issuecomment-2197116408 - git - -# ensure that nsswitch.conf is set up for Go's "netgo" implementation (which Docker explicitly uses) -# - https://github.com/moby/moby/blob/v24.0.6/hack/make.sh#L111 -# - https://github.com/golang/go/blob/go1.19.13/src/net/conf.go#L227-L303 -# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf - -# pre-add a "docker" group for socket usage -RUN set -eux; \ - addgroup -g 2375 -S docker - -ENV DOCKER_VERSION 29.10.0-rc.2 - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.2.tgz'; \ - sha256='f6960ea6a13bbac1a4bfdde08b13d937753d82dd083d8f29a5f855e4d157e1ee'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.2.tgz'; \ - sha256='69caab6e31d38ab4a0bfc2161d7284ea54d69a6f7d92747f03018d761ffd89f7'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.2.tgz'; \ - sha256='f0585679cc4214a6ba3c71a8def4386808de14e24b9d05f3a64e9e0107a7ae86'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.2.tgz'; \ - sha256='cb4a05dd5a1f3f9812e7f2d122fdd8bea30cc182b98d9559a013573f2443474c'; \ - ;; \ - 'ppc64le') \ - url='https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.2.tgz'; \ - sha256='b075ac18d0323a28e9189dcdbf1a8875803ff2cda55899041dddbed238ebbdfc'; \ - ;; \ - 's390x') \ - url='https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.2.tgz'; \ - sha256='bf396b9a56b35e9bdc7c7b4eaa0049b4b4d9e82684e9317921763d5c4790cf1c'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - echo "$sha256 *"'docker.tgz' | sha256sum -c -; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ - 'docker/docker' \ - ; \ - rm docker.tgz; \ - \ - docker --version - -ENV DOCKER_BUILDX_VERSION 0.39.0 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-amd64'; \ - sha256='5fb31a097304fbf6dd4038649a0decf32c2b9510e4047acd7d68b9d700c46194'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v6'; \ - sha256='462b5699af263c05c5c1d973ab33f41810c263585d5b8b3dcfa6f7d3a11bc987'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v7'; \ - sha256='a49d315f68f6ed91b2ea88da4259b418abe015be68460e0eebe0b8d9f74970b1'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm64'; \ - sha256='722cdcdfdd6f3fb943fa1ba75102d057feb18ba72aab93b1b0a8cf2b2b48a25f'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-ppc64le'; \ - sha256='dd7b1f65b7432229a619d3b92ddbdd742fb26fa8b4a281a99489431ef5e041b7'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-riscv64'; \ - sha256='58d328fe5a8e58f4e5934913c1f7c51d6633f197d28f3114fe2cb9026cfb5d74'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-s390x'; \ - sha256='754f15a88f4496b5ddea3ac5626dd068f836965f799253a6402b07d324c45892'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-buildx' "$url"; \ - echo "$sha256 *"'docker-buildx' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-buildx'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-buildx' "$plugin"; \ - chmod +x "$plugin"; \ - \ - docker buildx version - -ENV DOCKER_COMPOSE_VERSION 5.7.1 -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-x86_64'; \ - sha256='af426722a8af5de812fcee30cc1c39f0639f5f723cbadefb25e5d4db054064cf'; \ - ;; \ - 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv6'; \ - sha256='923137699688e7ea1aade66c16b9a1d475150487ccc99636d0f1de3ce46e6107'; \ - ;; \ - 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv7'; \ - sha256='c03e0c93cf747f311d39f6920a33c461fd0f7a6246439aaf259766527caa28f5'; \ - ;; \ - 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-aarch64'; \ - sha256='f2f49f903240895fa764c0dca3a14548b754ad9426f6b609ccaf55ec5a3aa2a5'; \ - ;; \ - 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-ppc64le'; \ - sha256='e41bf397abf7fc7a1cd35a039676067e6fc36d022a48847584db63cff0d9d196'; \ - ;; \ - 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-riscv64'; \ - sha256='29ba4c5fc8eb53e2fa2d0327c640c6a727086fd7efae79da47bf0a82bde290f3'; \ - ;; \ - 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-s390x'; \ - sha256='078f555e41e7c2d37d47f81cffd6b80d77288ba562bee19ac00215205edca278'; \ - ;; \ - *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ - esac; \ - \ - wget -O 'docker-compose' "$url"; \ - echo "$sha256 *"'docker-compose' | sha256sum -c -; \ - \ - plugin='/usr/local/libexec/docker/cli-plugins/docker-compose'; \ - mkdir -p "$(dirname "$plugin")"; \ - mv -vT 'docker-compose' "$plugin"; \ - chmod +x "$plugin"; \ - \ - ln -sv "$plugin" /usr/local/bin/; \ - docker-compose --version; \ - docker compose version - -COPY modprobe.sh /usr/local/bin/modprobe -COPY docker-entrypoint.sh /usr/local/bin/ - -# https://github.com/docker-library/docker/pull/166 -# dockerd-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-generating TLS certificates -# docker-entrypoint.sh uses DOCKER_TLS_CERTDIR for auto-setting DOCKER_TLS_VERIFY and DOCKER_CERT_PATH -# (For this to work, at least the "client" subdirectory of this path needs to be shared between the client and server containers via a volume, "docker cp", or other means of data sharing.) -ENV DOCKER_TLS_CERTDIR=/certs -# also, ensure the directory pre-exists and has wide enough permissions for "dockerd-entrypoint.sh" to create subdirectories, even when run in "rootless" mode -RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client -# (doing both /certs and /certs/client so that if Docker does a "copy-up" into a volume defined on /certs/client, it will "do the right thing" by default in a way that still works for rootless users) - -ENTRYPOINT ["docker-entrypoint.sh"] -CMD ["sh"] diff --git a/29-rc/cli/docker-entrypoint.sh b/29-rc/cli/docker-entrypoint.sh deleted file mode 100755 index d41cef8e3..000000000 --- a/29-rc/cli/docker-entrypoint.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -set -eu - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- docker "$@" -fi - -# if our command is a valid Docker subcommand, let's invoke it through Docker instead -# (this allows for "docker run docker ps", etc) -if docker help "$1" > /dev/null 2>&1; then - set -- docker "$@" -fi - -_should_tls() { - [ -n "${DOCKER_TLS_CERTDIR:-}" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/ca.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/cert.pem" ] \ - && [ -s "$DOCKER_TLS_CERTDIR/client/key.pem" ] -} - -# if we have no DOCKER_HOST but we do have the default Unix socket (standard or rootless), use it explicitly -if [ -z "${DOCKER_HOST:-}" ] && [ -S /var/run/docker.sock ]; then - export DOCKER_HOST=unix:///var/run/docker.sock -elif [ -z "${DOCKER_HOST:-}" ] && XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" && [ -S "$XDG_RUNTIME_DIR/docker.sock" ]; then - export DOCKER_HOST="unix://$XDG_RUNTIME_DIR/docker.sock" -fi - -# if DOCKER_HOST isn't set (no custom setting, no default socket), let's set it to a sane remote value -if [ -z "${DOCKER_HOST:-}" ]; then - if _should_tls || [ -n "${DOCKER_TLS_VERIFY:-}" ]; then - export DOCKER_HOST='tcp://docker:2376' - else - export DOCKER_HOST='tcp://docker:2375' - fi -fi -if [ "${DOCKER_HOST#tcp:}" != "$DOCKER_HOST" ] \ - && [ -z "${DOCKER_TLS_VERIFY:-}" ] \ - && [ -z "${DOCKER_CERT_PATH:-}" ] \ - && _should_tls \ -; then - export DOCKER_TLS_VERIFY=1 - export DOCKER_CERT_PATH="$DOCKER_TLS_CERTDIR/client" -fi - -if [ "$1" = 'dockerd' ]; then - cat >&2 <<-'EOW' - - 📎 Hey there! It looks like you're trying to run a Docker daemon. - - You probably should use the "dind" image variant instead, something like: - - docker run --privileged --name some-docker ... docker:dind ... - - See https://hub.docker.com/_/docker/ for more documentation and usage examples. - - EOW - sleep 3 -fi - -exec "$@" diff --git a/29-rc/cli/modprobe.sh b/29-rc/cli/modprobe.sh deleted file mode 100755 index b357d893f..000000000 --- a/29-rc/cli/modprobe.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -eu - -# "modprobe" without modprobe -# https://twitter.com/lucabruno/status/902934379835662336 - -# this isn't 100% fool-proof, but it'll have a much higher success rate than simply using the "real" modprobe - -# Docker often uses "modprobe -va foo bar baz" -# so we ignore modules that start with "-" -for module; do - if [ "${module#-}" = "$module" ]; then - ip link show "$module" || true - lsmod | grep "$module" || true - fi -done - -# remove /usr/local/... from PATH so we can exec the real modprobe as a last resort -export PATH='/usr/sbin:/usr/bin:/sbin:/bin' -exec modprobe "$@" diff --git a/29-rc/dind-rootless/Dockerfile b/29-rc/dind-rootless/Dockerfile deleted file mode 100644 index 1f18d8601..000000000 --- a/29-rc/dind-rootless/Dockerfile +++ /dev/null @@ -1,56 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-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 -# slirp4netns is recommended as rootlesskit's net driver -# https://github.com/rootless-containers/rootlesskit/blob/be156df0429551f5c23dc61dd07201b33076ff1d/docs/network.md#--netslirp4netns-recommended -RUN apk add --no-cache iproute2 fuse-overlayfs slirp4netns - -# "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR -RUN mkdir /run/user && chmod 1777 /run/user - -# create a default user preconfigured for running rootless dockerd -RUN set -eux; \ - adduser -h /home/rootless -g 'Rootless' -D -u 1000 rootless; \ - echo 'rootless:100000:65536' >> /etc/subuid; \ - echo 'rootless:100000:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.10.0-rc.2.tgz'; \ - sha256='6770d56b342c26542aabbc32fd27e1848aa6b53f840dc61a6c35342aefa08cfc'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.10.0-rc.2.tgz'; \ - sha256='8f215560516e21c1bad7bc0dafd220e86bfef141060725d2b5263ac3426558ca'; \ - ;; \ - *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'rootless.tgz' "$url"; \ - \ - tar --extract \ - --file rootless.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - 'docker-rootless-extras/rootlesskit' \ - ; \ - rm rootless.tgz; \ - \ - rootlesskit --version - -# pre-create "/var/lib/docker" for our rootless user -RUN set -eux; \ - mkdir -p /home/rootless/.local/share/docker; \ - chown -R rootless:rootless /home/rootless/.local/share/docker -VOLUME /home/rootless/.local/share/docker -USER rootless diff --git a/29-rc/dind/Dockerfile b/29-rc/dind/Dockerfile deleted file mode 100644 index 12d09257c..000000000 --- a/29-rc/dind/Dockerfile +++ /dev/null @@ -1,117 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM docker:29-rc-cli - -# Runtime dependencies: -# - https://github.com/moby/moby/blob/864598f8c2677189e308eb4a3b3c0dd41fc06599/project/PACKAGERS.md#runtime-dependencies#runtime-dependencies -# - https://github.com/docker/packaging/blob/0ba325d178593583f190dc91566214a85c3880ad/pkg/docker-engine/deb/control#L24-L36 -RUN set -eux; \ - apk add --no-cache \ - ip6tables \ - iptables \ - openssl \ - pigz \ - shadow-uidmap \ - xz \ - ; - -# dind might be used on systems where the nf_tables kernel module isn't available. In that case, -# we need to switch over to xtables-legacy. See https://github.com/docker-library/docker/issues/463 -RUN set -eux; \ - apk add --no-cache iptables-legacy; \ -# set up a symlink farm we can use PATH to switch to legacy with - mkdir -p /usr/local/sbin/.iptables-legacy; \ -# https://gitlab.alpinelinux.org/alpine/aports/-/blob/a7e1610a67a46fc52668528efe01cee621c2ba6c/main/iptables/APKBUILD#L77 - for f in \ - iptables \ - iptables-save \ - iptables-restore \ - ip6tables \ - ip6tables-save \ - ip6tables-restore \ - ; do \ -# "iptables-save" -> "iptables-legacy-save", "ip6tables" -> "ip6tables-legacy", etc. -# https://pkgs.alpinelinux.org/contents?branch=v3.24&name=iptables-legacy&arch=x86_64 - b="$(command -v "${f/tables/tables-legacy}")"; \ - "$b" --version; \ - ln -svT "$b" "/usr/local/sbin/.iptables-legacy/$f"; \ - done; \ -# verify it works (and gets us legacy) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH"; \ - iptables --version | grep legacy - -# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box -RUN set -eux; \ - addgroup -S dockremap; \ - adduser -S -G dockremap dockremap; \ - echo 'dockremap:165536:65536' >> /etc/subuid; \ - echo 'dockremap:165536:65536' >> /etc/subgid - -RUN set -eux; \ - \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.2.tgz'; \ - sha256='f6960ea6a13bbac1a4bfdde08b13d937753d82dd083d8f29a5f855e4d157e1ee'; \ - ;; \ - 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.2.tgz'; \ - sha256='69caab6e31d38ab4a0bfc2161d7284ea54d69a6f7d92747f03018d761ffd89f7'; \ - ;; \ - 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.2.tgz'; \ - sha256='f0585679cc4214a6ba3c71a8def4386808de14e24b9d05f3a64e9e0107a7ae86'; \ - ;; \ - 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.2.tgz'; \ - sha256='cb4a05dd5a1f3f9812e7f2d122fdd8bea30cc182b98d9559a013573f2443474c'; \ - ;; \ - 'ppc64le') \ - url='https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.2.tgz'; \ - sha256='b075ac18d0323a28e9189dcdbf1a8875803ff2cda55899041dddbed238ebbdfc'; \ - ;; \ - 's390x') \ - url='https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.2.tgz'; \ - sha256='bf396b9a56b35e9bdc7c7b4eaa0049b4b4d9e82684e9317921763d5c4790cf1c'; \ - ;; \ - *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ - esac; \ - \ - wget -O 'docker.tgz' "$url"; \ - echo "$sha256 *"'docker.tgz' | sha256sum -c -; \ - \ - tar --extract \ - --file docker.tgz \ - --strip-components 1 \ - --directory /usr/local/bin/ \ - --no-same-owner \ -# we exclude the CLI binary because we already extracted that over in the "docker:29-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer - --exclude 'docker/docker' \ -# exclude containerd, relying on the "embedded containerd" instead: https://github.com/moby/moby/pull/53388 (makes for a smaller image) - --exclude 'docker/containerd' \ - ; \ - rm docker.tgz; \ - \ - dockerd --version; \ - ctr --version; \ - runc --version - -# https://github.com/moby/moby/tree/master/hack/dind -ENV DIND_COMMIT 8d9e3502aba39127e4d12196dae16d306f76993d - -RUN set -eux; \ - wget -O /usr/local/bin/dind "https://raw.githubusercontent.com/moby/moby/${DIND_COMMIT}/hack/dind"; \ - chmod +x /usr/local/bin/dind - -COPY dockerd-entrypoint.sh /usr/local/bin/ - -VOLUME /var/lib/docker -EXPOSE 2375 2376 - -ENTRYPOINT ["dockerd-entrypoint.sh"] -CMD [] diff --git a/29-rc/dind/dockerd-entrypoint.sh b/29-rc/dind/dockerd-entrypoint.sh deleted file mode 100755 index 130883d69..000000000 --- a/29-rc/dind/dockerd-entrypoint.sh +++ /dev/null @@ -1,238 +0,0 @@ -#!/bin/sh -set -eu - -_tls_ensure_private() { - local f="$1"; shift - [ -s "$f" ] || openssl genrsa -out "$f" 4096 -} -_tls_san() { - { - ip -oneline address | awk '{ gsub(/\/.+$/, "", $4); print "IP:" $4 }' - { - cat /etc/hostname - echo 'docker' - echo 'localhost' - hostname -f - hostname -s - } | sed 's/^/DNS:/' - [ -z "${DOCKER_TLS_SAN:-}" ] || echo "$DOCKER_TLS_SAN" - } | sort -u | xargs printf '%s,' | sed "s/,\$//" -} -_tls_generate_certs() { - local dir="$1"; shift - - # if server/{ca,key,cert}.pem && !ca/key.pem, do NOTHING except verify (user likely managing CA themselves) - # if ca/key.pem || !ca/cert.pem, generate CA public if necessary - # if ca/key.pem, generate server public - # if ca/key.pem, generate client public - # (regenerating public certs every startup to account for SAN/IP changes and/or expiration) - - if [ -s "$dir/server/ca.pem" ] && [ -s "$dir/server/cert.pem" ] && [ -s "$dir/server/key.pem" ] && [ ! -s "$dir/ca/key.pem" ]; then - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - return 0 - fi - - # https://github.com/FiloSottile/mkcert/issues/174 - local certValidDays='825' - - if [ -s "$dir/ca/key.pem" ] || [ ! -s "$dir/ca/cert.pem" ]; then - # if we either have a CA private key or do *not* have a CA public key, then we should create/manage the CA - mkdir -p "$dir/ca" - _tls_ensure_private "$dir/ca/key.pem" - openssl req -new -key "$dir/ca/key.pem" \ - -out "$dir/ca/cert.pem" \ - -subj '/CN=docker:dind CA' \ - -x509 \ - -days "$certValidDays" \ - -addext keyUsage=critical,digitalSignature,keyCertSign - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a server key - mkdir -p "$dir/server" - _tls_ensure_private "$dir/server/key.pem" - openssl req -new -key "$dir/server/key.pem" \ - -out "$dir/server/csr.pem" \ - -subj '/CN=docker:dind server' - cat > "$dir/server/openssl.cnf" <<-EOF - [ x509_exts ] - extendedKeyUsage = serverAuth - subjectAltName = $(_tls_san) - EOF - openssl x509 -req \ - -in "$dir/server/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/server/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/server/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/server/ca.pem" - openssl verify -CAfile "$dir/server/ca.pem" "$dir/server/cert.pem" - fi - - if [ -s "$dir/ca/key.pem" ]; then - # if we have a CA private key, we should create/manage a client key - mkdir -p "$dir/client" - _tls_ensure_private "$dir/client/key.pem" - chmod 0644 "$dir/client/key.pem" # openssl defaults to 0600 for the private key, but this one needs to be shared with arbitrary client contexts - openssl req -new \ - -key "$dir/client/key.pem" \ - -out "$dir/client/csr.pem" \ - -subj '/CN=docker:dind client' - cat > "$dir/client/openssl.cnf" <<-'EOF' - [ x509_exts ] - extendedKeyUsage = clientAuth - EOF - openssl x509 -req \ - -in "$dir/client/csr.pem" \ - -CA "$dir/ca/cert.pem" \ - -CAkey "$dir/ca/key.pem" \ - -CAcreateserial \ - -out "$dir/client/cert.pem" \ - -days "$certValidDays" \ - -extfile "$dir/client/openssl.cnf" \ - -extensions x509_exts - cp "$dir/ca/cert.pem" "$dir/client/ca.pem" - openssl verify -CAfile "$dir/client/ca.pem" "$dir/client/cert.pem" - fi -} - -# no arguments passed -# or first arg is `-f` or `--some-option` -if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then - # set "dockerSocket" to the default "--host" *unix socket* value (for both standard or rootless) - uid="$(id -u)" - if [ "$uid" = '0' ]; then - dockerSocket='unix:///var/run/docker.sock' - else - # if we're not root, we must be trying to run rootless - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - dockerSocket="unix://$XDG_RUNTIME_DIR/docker.sock" - fi - case "${DOCKER_HOST:-}" in - unix://*) - dockerSocket="$DOCKER_HOST" - ;; - esac - - # add our default arguments - if [ -n "${DOCKER_TLS_CERTDIR:-}" ]; then - _tls_generate_certs "$DOCKER_TLS_CERTDIR" - # generate certs and use TLS if requested/possible (default in 19.03+) - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2376 \ - --tlsverify \ - --tlscacert "$DOCKER_TLS_CERTDIR/server/ca.pem" \ - --tlscert "$DOCKER_TLS_CERTDIR/server/cert.pem" \ - --tlskey "$DOCKER_TLS_CERTDIR/server/key.pem" \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2376:2376/tcp" - else - # TLS disabled (-e DOCKER_TLS_CERTDIR='') or missing certs - set -- dockerd \ - --host="$dockerSocket" \ - --host=tcp://0.0.0.0:2375 \ - "$@" - DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS="${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} -p 0.0.0.0:2375:2375/tcp" - fi -fi - -if [ "$1" = 'dockerd' ]; then - # explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file) - find /run /var/run -iname 'docker*.pid' -delete || : - - # XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes) - set -- docker-init -- "$@" - - iptablesLegacy= - if [ -n "${DOCKER_IPTABLES_LEGACY+x}" ]; then - # let users choose explicitly to legacy or not to legacy - iptablesLegacy="$DOCKER_IPTABLES_LEGACY" - if [ -n "$iptablesLegacy" ]; then - modprobe ip_tables || : - modprobe ip6_tables || : - else - modprobe nf_tables || : - fi - elif ( - # https://git.netfilter.org/iptables/tree/iptables/nft-shared.c?id=f5cf76626d95d2c491a80288bccc160c53b44e88#n420 - # https://github.com/docker-library/docker/pull/468#discussion_r1442131459 - for f in /proc/net/ip_tables_names /proc/net/ip6_tables_names /proc/net/arp_tables_names; do - if [ -r "$f" ] && b="$(cat "$f")" && [ -n "$b" ]; then - exit 0 - fi - done - exit 1 - ); then - # if we already have any "legacy" iptables rules, we should always use legacy - iptablesLegacy=1 - elif ! iptables -nL > /dev/null 2>&1; then - # if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using xtables, for example) - # https://github.com/docker-library/docker/issues/350 - # https://github.com/moby/moby/issues/26824 - # https://github.com/docker-library/docker/pull/437#issuecomment-1854900620 - modprobe nf_tables || : - if ! iptables -nL > /dev/null 2>&1; then - # might be host has no nf_tables, but Alpine is all-in now (so let's try a legacy fallback) - modprobe ip_tables || : - modprobe ip6_tables || : - if /usr/local/sbin/.iptables-legacy/iptables -nL > /dev/null 2>&1; then - iptablesLegacy=1 - fi - fi - fi - if [ -n "$iptablesLegacy" ]; then - # see https://github.com/docker-library/docker/issues/463 (and the dind Dockerfile where this directory is set up) - export PATH="/usr/local/sbin/.iptables-legacy:$PATH" - fi - iptables --version # so users can see whether it's legacy or not - - uid="$(id -u)" - if [ "$uid" != '0' ]; then - # if we're not root, we must be trying to run rootless - if ! command -v rootlesskit > /dev/null; then - echo >&2 "error: attempting to run rootless dockerd but missing 'rootlesskit' (perhaps the 'docker:dind-rootless' image variant is intended?)" - exit 1 - fi - user="$(id -un 2>/dev/null || :)" - if ! grep -qE "^($uid${user:+|$user}):" /etc/subuid || ! grep -qE "^($uid${user:+|$user}):" /etc/subgid; then - echo >&2 "error: attempting to run rootless dockerd but missing necessary entries in /etc/subuid and/or /etc/subgid for $uid" - exit 1 - fi - : "${XDG_RUNTIME_DIR:=/run/user/$uid}" - export XDG_RUNTIME_DIR - if ! mkdir -p "$XDG_RUNTIME_DIR" || [ ! -w "$XDG_RUNTIME_DIR" ] || ! mkdir -p "$HOME/.local/share/docker" || [ ! -w "$HOME/.local/share/docker" ]; then - echo >&2 "error: attempting to run rootless dockerd but need writable HOME ($HOME) and XDG_RUNTIME_DIR ($XDG_RUNTIME_DIR) for user $uid" - exit 1 - fi - if [ -f /proc/sys/kernel/unprivileged_userns_clone ] && unprivClone="$(cat /proc/sys/kernel/unprivileged_userns_clone)" && [ "$unprivClone" != '1' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'kernel.unprivileged_userns_clone' (/proc/sys/kernel/unprivileged_userns_clone) set to 1" - exit 1 - fi - if [ -f /proc/sys/user/max_user_namespaces ] && maxUserns="$(cat /proc/sys/user/max_user_namespaces)" && [ "$maxUserns" = '0' ]; then - echo >&2 "error: attempting to run rootless dockerd but need 'user.max_user_namespaces' (/proc/sys/user/max_user_namespaces) set to a sufficiently large value" - exit 1 - fi - # TODO overlay support detection? - exec rootlesskit \ - --net="${DOCKERD_ROOTLESS_ROOTLESSKIT_NET:-slirp4netns}" \ - --mtu="${DOCKERD_ROOTLESS_ROOTLESSKIT_MTU:-1500}" \ - --disable-host-loopback \ - --port-driver=builtin \ - --copy-up=/etc \ - --copy-up=/run \ - ${DOCKERD_ROOTLESS_ROOTLESSKIT_FLAGS:-} \ - "$@" - elif [ -x '/usr/local/bin/dind' ]; then - # if we have the (mostly defunct now) Docker-in-Docker wrapper script, use it - set -- '/usr/local/bin/dind' "$@" - fi -else - # if it isn't `dockerd` we're trying to run, pass it through `docker-entrypoint.sh` so it gets `DOCKER_HOST` set appropriately too - set -- docker-entrypoint.sh "$@" -fi - -exec "$@" diff --git a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile b/29-rc/windows/windowsservercore-ltsc2022/Dockerfile deleted file mode 100644 index 6c126a8d1..000000000 --- a/29-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.10.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.2.zip -ENV DOCKER_SHA256 1c9067b9ff433a94ff85507e5ba822936cfac615861684f76bc8cae6edc72451 - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_SHA256); \ - if ((Get-FileHash docker.zip -Algorithm sha256).Hash -ne $env:DOCKER_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.39.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.7.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile b/29-rc/windows/windowsservercore-ltsc2025/Dockerfile deleted file mode 100644 index c230b9f95..000000000 --- a/29-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ /dev/null @@ -1,95 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# PATH isn't actually set in the Docker image, so we have to set it from within the container -RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ - [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); -# doing this first to share cache across versions more aggressively - -ENV DOCKER_VERSION 29.10.0-rc.2 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.2.zip -ENV DOCKER_SHA256 1c9067b9ff433a94ff85507e5ba822936cfac615861684f76bc8cae6edc72451 - -RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_SHA256); \ - if ((Get-FileHash docker.zip -Algorithm sha256).Hash -ne $env:DOCKER_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \ -# (this archive has a "docker/..." directory in it already) - \ - Write-Host 'Removing ...'; \ - Remove-Item @( \ - 'docker.zip', \ - ('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \ - ) -Force; \ - \ - Write-Host 'Verifying install ("docker --version") ...'; \ - docker --version; \ - \ - Write-Host 'Complete.'; - -# https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.39.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-buildx.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_BUILDX_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_BUILDX_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_BUILDX_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_BUILDX_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker buildx version") ...'; \ - docker buildx version; \ - \ - Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.7.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0 -RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ - Write-Host ('Creating {0} ...' -f $dir); \ - New-Item -ItemType Directory $dir -Force; \ - \ - $plugin = ('{0}\docker-compose.exe' -f $dir); \ - Write-Host ('Downloading {0} ...' -f $env:DOCKER_COMPOSE_URL); \ - Invoke-WebRequest -Uri $env:DOCKER_COMPOSE_URL -OutFile $plugin; \ - \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:DOCKER_COMPOSE_SHA256); \ - if ((Get-FileHash $plugin -Algorithm sha256).Hash -ne $env:DOCKER_COMPOSE_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Verifying install ("docker compose version") ...'; \ - docker compose version; \ - \ - $link = ('{0}\docker\docker-compose.exe' -f $env:ProgramFiles); \ - Write-Host ('Linking {0} to {1} ...' -f $plugin, $link); \ - New-Item -ItemType SymbolicLink -Path $link -Target $plugin; \ - \ - Write-Host 'Verifying install ("docker-compose --version") ...'; \ - docker-compose --version; \ - \ - Write-Host 'Complete.'; diff --git a/versions.json b/versions.json index 215a54da1..c278731dc 100644 --- a/versions.json +++ b/versions.json @@ -194,199 +194,5 @@ ], "version": "29.10.0" }, - "29-rc": { - "arches": { - "amd64": { - "dockerSha256": "f6960ea6a13bbac1a4bfdde08b13d937753d82dd083d8f29a5f855e4d157e1ee", - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-29.10.0-rc.2.tgz", - "rootlessExtrasSha256": "6770d56b342c26542aabbc32fd27e1848aa6b53f840dc61a6c35342aefa08cfc", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-29.10.0-rc.2.tgz" - }, - "arm32v6": { - "dockerSha256": "69caab6e31d38ab4a0bfc2161d7284ea54d69a6f7d92747f03018d761ffd89f7", - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-29.10.0-rc.2.tgz" - }, - "arm32v7": { - "dockerSha256": "f0585679cc4214a6ba3c71a8def4386808de14e24b9d05f3a64e9e0107a7ae86", - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-29.10.0-rc.2.tgz" - }, - "arm64v8": { - "dockerSha256": "cb4a05dd5a1f3f9812e7f2d122fdd8bea30cc182b98d9559a013573f2443474c", - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-29.10.0-rc.2.tgz", - "rootlessExtrasSha256": "8f215560516e21c1bad7bc0dafd220e86bfef141060725d2b5263ac3426558ca", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-29.10.0-rc.2.tgz" - }, - "ppc64le": { - "dockerSha256": "b075ac18d0323a28e9189dcdbf1a8875803ff2cda55899041dddbed238ebbdfc", - "dockerUrl": "https://download.docker.com/linux/static/test/ppc64le/docker-29.10.0-rc.2.tgz" - }, - "s390x": { - "dockerSha256": "bf396b9a56b35e9bdc7c7b4eaa0049b4b4d9e82684e9317921763d5c4790cf1c", - "dockerUrl": "https://download.docker.com/linux/static/test/s390x/docker-29.10.0-rc.2.tgz" - }, - "windows-amd64": { - "dockerSha256": "1c9067b9ff433a94ff85507e5ba822936cfac615861684f76bc8cae6edc72451", - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-29.10.0-rc.2.zip" - } - }, - "buildx": { - "arches": { - "amd64": { - "file": "buildx-v0.39.0.linux-amd64", - "sha256": "5fb31a097304fbf6dd4038649a0decf32c2b9510e4047acd7d68b9d700c46194", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-amd64" - }, - "arm32v6": { - "file": "buildx-v0.39.0.linux-arm-v6", - "sha256": "462b5699af263c05c5c1d973ab33f41810c263585d5b8b3dcfa6f7d3a11bc987", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v6" - }, - "arm32v7": { - "file": "buildx-v0.39.0.linux-arm-v7", - "sha256": "a49d315f68f6ed91b2ea88da4259b418abe015be68460e0eebe0b8d9f74970b1", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v7" - }, - "arm64v8": { - "file": "buildx-v0.39.0.linux-arm64", - "sha256": "722cdcdfdd6f3fb943fa1ba75102d057feb18ba72aab93b1b0a8cf2b2b48a25f", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm64" - }, - "darwin-amd64": { - "file": "buildx-v0.39.0.darwin-amd64", - "sha256": "dda7fe88c8ac15ebc4fd57c452ee3ba44336967c74221a0b229b6cff68bec538", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.darwin-amd64" - }, - "darwin-arm64v8": { - "file": "buildx-v0.39.0.darwin-arm64", - "sha256": "0190e4b9c85510974290f9a597e86c4d8200be782aeaa3df7d756ab4423d6b2d", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.darwin-arm64" - }, - "freebsd-amd64": { - "file": "buildx-v0.39.0.freebsd-amd64", - "sha256": "e9c558170bd90fa64624a2fb8be3fe49c19ff20179ff9ca90e158be1c0a5a1b1", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.freebsd-amd64" - }, - "freebsd-arm64v8": { - "file": "buildx-v0.39.0.freebsd-arm64", - "sha256": "e675fd6288733fcba8e2fb83f5dea7b2eb6b9d5ed113a014c691ba53ba22a7da", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.freebsd-arm64" - }, - "netbsd-amd64": { - "file": "buildx-v0.39.0.netbsd-amd64", - "sha256": "ff57e8f0e579310eecd83932711e70caba71e77032d3fd5c30c28b8879c5f6ff", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.netbsd-amd64" - }, - "netbsd-arm64v8": { - "file": "buildx-v0.39.0.netbsd-arm64", - "sha256": "4a719008779ca3c8c9422efbca191ee12edfad33775b0c15d8cd4cd6a8b0a5b4", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.netbsd-arm64" - }, - "openbsd-amd64": { - "file": "buildx-v0.39.0.openbsd-amd64", - "sha256": "02be7ee1aa2ec4925699197c23a85237f57ec4432e21d159744004ed5532566c", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.openbsd-amd64" - }, - "openbsd-arm64v8": { - "file": "buildx-v0.39.0.openbsd-arm64", - "sha256": "cc049d24dd236e9ad5816fc8747958d35ea2a2dc5876650cfeb16a64879461d4", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.openbsd-arm64" - }, - "ppc64le": { - "file": "buildx-v0.39.0.linux-ppc64le", - "sha256": "dd7b1f65b7432229a619d3b92ddbdd742fb26fa8b4a281a99489431ef5e041b7", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-ppc64le" - }, - "riscv64": { - "file": "buildx-v0.39.0.linux-riscv64", - "sha256": "58d328fe5a8e58f4e5934913c1f7c51d6633f197d28f3114fe2cb9026cfb5d74", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-riscv64" - }, - "s390x": { - "file": "buildx-v0.39.0.linux-s390x", - "sha256": "754f15a88f4496b5ddea3ac5626dd068f836965f799253a6402b07d324c45892", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-s390x" - }, - "windows-amd64": { - "file": "buildx-v0.39.0.windows-amd64.exe", - "sha256": "b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe" - }, - "windows-arm64v8": { - "file": "buildx-v0.39.0.windows-arm64.exe", - "sha256": "95987aac9f3b9833e12ca7de963416d403e1e1dc7b7c974c165f2ecb1a587868", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-arm64.exe" - } - }, - "version": "0.39.0" - }, - "compose": { - "arches": { - "amd64": { - "file": "docker-compose-linux-x86_64", - "sha256": "af426722a8af5de812fcee30cc1c39f0639f5f723cbadefb25e5d4db054064cf", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-x86_64" - }, - "arm32v6": { - "file": "docker-compose-linux-armv6", - "sha256": "923137699688e7ea1aade66c16b9a1d475150487ccc99636d0f1de3ce46e6107", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv6" - }, - "arm32v7": { - "file": "docker-compose-linux-armv7", - "sha256": "c03e0c93cf747f311d39f6920a33c461fd0f7a6246439aaf259766527caa28f5", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv7" - }, - "arm64v8": { - "file": "docker-compose-linux-aarch64", - "sha256": "f2f49f903240895fa764c0dca3a14548b754ad9426f6b609ccaf55ec5a3aa2a5", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-aarch64" - }, - "darwin-amd64": { - "file": "docker-compose-darwin-x86_64", - "sha256": "c28b37c7bf1cc315acdf511c2c0f34ce19d4d33b6038611617063a99c45417c6", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-darwin-x86_64" - }, - "darwin-arm64v8": { - "file": "docker-compose-darwin-aarch64", - "sha256": "5a9aa8b5fb5b1e3cd83f39c80e570ae30aafd74cd9b47264fbe4ff7e6e6251ca", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-darwin-aarch64" - }, - "ppc64le": { - "file": "docker-compose-linux-ppc64le", - "sha256": "e41bf397abf7fc7a1cd35a039676067e6fc36d022a48847584db63cff0d9d196", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-ppc64le" - }, - "riscv64": { - "file": "docker-compose-linux-riscv64", - "sha256": "29ba4c5fc8eb53e2fa2d0327c640c6a727086fd7efae79da47bf0a82bde290f3", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-riscv64" - }, - "s390x": { - "file": "docker-compose-linux-s390x", - "sha256": "078f555e41e7c2d37d47f81cffd6b80d77288ba562bee19ac00215205edca278", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-s390x" - }, - "windows-amd64": { - "file": "docker-compose-windows-x86_64.exe", - "sha256": "e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe" - }, - "windows-arm64v8": { - "file": "docker-compose-windows-aarch64.exe", - "sha256": "3ed47ab4d1cd56d63981246820420e7aaf042f2a48e6ccc95993872980a4e0a9", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-aarch64.exe" - } - }, - "version": "5.7.1" - }, - "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", - "variants": [ - "cli", - "dind", - "dind-rootless", - "windows/windowsservercore-ltsc2025", - "windows/windowsservercore-ltsc2022" - ], - "version": "29.10.0-rc.2" - } + "29-rc": null } From 35f528920e050e9fc83ca8ba497be9195c326301 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Nov 2026 02:04:23 -0800 Subject: [PATCH 665/667] Update 29 to compose 5.7.2 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 458b8b686..63b87bf00 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -116,38 +116,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.7.1 +ENV DOCKER_COMPOSE_VERSION 5.7.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-x86_64'; \ - sha256='af426722a8af5de812fcee30cc1c39f0639f5f723cbadefb25e5d4db054064cf'; \ + url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-x86_64'; \ + sha256='e14235d9c622c5bd57eb8adeed4a0f7308c7f3862e6812dd843f6fe27f1307cc'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv6'; \ - sha256='923137699688e7ea1aade66c16b9a1d475150487ccc99636d0f1de3ce46e6107'; \ + url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-armv6'; \ + sha256='fa75f7fbe0f3a52079a6c4a9de042b12f48ec3b3e7ba6cd17a580041c836d9cc'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv7'; \ - sha256='c03e0c93cf747f311d39f6920a33c461fd0f7a6246439aaf259766527caa28f5'; \ + url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-armv7'; \ + sha256='1a6dae3953997851a54c9a89df03b443c0f40653c6f9c1c4944a94492145ace8'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-aarch64'; \ - sha256='f2f49f903240895fa764c0dca3a14548b754ad9426f6b609ccaf55ec5a3aa2a5'; \ + url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-aarch64'; \ + sha256='e3afd91588e494ff309fced4ad40c5fa93ababe54c1c2eeffe90865719d8d0db'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-ppc64le'; \ - sha256='e41bf397abf7fc7a1cd35a039676067e6fc36d022a48847584db63cff0d9d196'; \ + url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-ppc64le'; \ + sha256='c8b8789049235d0d76a7db1f18e888976dd780c65e09916a596b7a786b3c0a64'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-riscv64'; \ - sha256='29ba4c5fc8eb53e2fa2d0327c640c6a727086fd7efae79da47bf0a82bde290f3'; \ + url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-riscv64'; \ + sha256='4b1a69cb84018857ff3984aa848c3d67546a638e99b9ba96c48f7a5ecfa177b0'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-s390x'; \ - sha256='078f555e41e7c2d37d47f81cffd6b80d77288ba562bee19ac00215205edca278'; \ + url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-s390x'; \ + sha256='356f87ca3e341f32e141994c1d3b62818d1245fb542360148cb52458b074b76c'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 2bd9ee819..7402cbe4a 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -65,9 +65,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.7.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0 +ENV DOCKER_COMPOSE_VERSION 5.7.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 14b0f56d597539dd87e41e86047aaa350bbc6f1eccf98386aab77626bb3fd96b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index a395b91be..0dab4f240 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -65,9 +65,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.7.1 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0 +ENV DOCKER_COMPOSE_VERSION 5.7.2 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 14b0f56d597539dd87e41e86047aaa350bbc6f1eccf98386aab77626bb3fd96b RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index c278731dc..53a5255a0 100644 --- a/versions.json +++ b/versions.json @@ -128,61 +128,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "af426722a8af5de812fcee30cc1c39f0639f5f723cbadefb25e5d4db054064cf", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-x86_64" + "sha256": "e14235d9c622c5bd57eb8adeed4a0f7308c7f3862e6812dd843f6fe27f1307cc", + "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "923137699688e7ea1aade66c16b9a1d475150487ccc99636d0f1de3ce46e6107", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv6" + "sha256": "fa75f7fbe0f3a52079a6c4a9de042b12f48ec3b3e7ba6cd17a580041c836d9cc", + "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "c03e0c93cf747f311d39f6920a33c461fd0f7a6246439aaf259766527caa28f5", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-armv7" + "sha256": "1a6dae3953997851a54c9a89df03b443c0f40653c6f9c1c4944a94492145ace8", + "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "f2f49f903240895fa764c0dca3a14548b754ad9426f6b609ccaf55ec5a3aa2a5", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-aarch64" + "sha256": "e3afd91588e494ff309fced4ad40c5fa93ababe54c1c2eeffe90865719d8d0db", + "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "c28b37c7bf1cc315acdf511c2c0f34ce19d4d33b6038611617063a99c45417c6", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-darwin-x86_64" + "sha256": "0c50a809f7e60de9f32cafdc24074f20249f89d415fdd3823d3e011a770a796d", + "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "5a9aa8b5fb5b1e3cd83f39c80e570ae30aafd74cd9b47264fbe4ff7e6e6251ca", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-darwin-aarch64" + "sha256": "85b86e18da0d39cea41124773b432ef3d9ac64da068432c5f4170a25058bb74b", + "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "e41bf397abf7fc7a1cd35a039676067e6fc36d022a48847584db63cff0d9d196", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-ppc64le" + "sha256": "c8b8789049235d0d76a7db1f18e888976dd780c65e09916a596b7a786b3c0a64", + "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "29ba4c5fc8eb53e2fa2d0327c640c6a727086fd7efae79da47bf0a82bde290f3", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-riscv64" + "sha256": "4b1a69cb84018857ff3984aa848c3d67546a638e99b9ba96c48f7a5ecfa177b0", + "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "078f555e41e7c2d37d47f81cffd6b80d77288ba562bee19ac00215205edca278", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-linux-s390x" + "sha256": "356f87ca3e341f32e141994c1d3b62818d1245fb542360148cb52458b074b76c", + "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "e4316597452650ae92fe9719a2a7c2fce8f56c5ceafed88d2aed6e39b2b2b2d0", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-x86_64.exe" + "sha256": "14b0f56d597539dd87e41e86047aaa350bbc6f1eccf98386aab77626bb3fd96b", + "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "3ed47ab4d1cd56d63981246820420e7aaf042f2a48e6ccc95993872980a4e0a9", - "url": "https://github.com/docker/compose/releases/download/v5.7.1/docker-compose-windows-aarch64.exe" + "sha256": "46e393b4e4e26958fefca5999c73ed456b8111ecb8ed260074a27ff349b67a51", + "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-windows-aarch64.exe" } }, - "version": "5.7.1" + "version": "5.7.2" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From f1ce999b8473c47d384a5ea40e5795274b6edcd0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Nov 2026 08:04:35 -0800 Subject: [PATCH 666/667] Update 29 to compose 5.8.0 --- 29/cli/Dockerfile | 30 ++++++------ .../windowsservercore-ltsc2022/Dockerfile | 6 +-- .../windowsservercore-ltsc2025/Dockerfile | 6 +-- versions.json | 46 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 63b87bf00..4eeb62afc 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -116,38 +116,38 @@ RUN set -eux; \ \ docker buildx version -ENV DOCKER_COMPOSE_VERSION 5.7.2 +ENV DOCKER_COMPOSE_VERSION 5.8.0 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-x86_64'; \ - sha256='e14235d9c622c5bd57eb8adeed4a0f7308c7f3862e6812dd843f6fe27f1307cc'; \ + url='https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-x86_64'; \ + sha256='b8840f5008c447f41fce0a57ae3adeab42c89b1eb6e6012524bcabbfb4ffbaf6'; \ ;; \ 'armhf') \ - url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-armv6'; \ - sha256='fa75f7fbe0f3a52079a6c4a9de042b12f48ec3b3e7ba6cd17a580041c836d9cc'; \ + url='https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-armv6'; \ + sha256='c88658466ae9a4dadae64e6a4ec125202212bd460934537bd482bcd5e313f57b'; \ ;; \ 'armv7') \ - url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-armv7'; \ - sha256='1a6dae3953997851a54c9a89df03b443c0f40653c6f9c1c4944a94492145ace8'; \ + url='https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-armv7'; \ + sha256='a7a79755648b975b66df08b4bfbe12b29f113d5dd8c7cd5b6b53b69efff2f422'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-aarch64'; \ - sha256='e3afd91588e494ff309fced4ad40c5fa93ababe54c1c2eeffe90865719d8d0db'; \ + url='https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-aarch64'; \ + sha256='1a9c918b2fb49b9c87f0018c64b5abd0d30715155e98dc939779fbaee6c414d3'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-ppc64le'; \ - sha256='c8b8789049235d0d76a7db1f18e888976dd780c65e09916a596b7a786b3c0a64'; \ + url='https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-ppc64le'; \ + sha256='921437ba1fe9b5f7e3146c74c4d6c56673881741561c71bc23106b1e45886b1d'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-riscv64'; \ - sha256='4b1a69cb84018857ff3984aa848c3d67546a638e99b9ba96c48f7a5ecfa177b0'; \ + url='https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-riscv64'; \ + sha256='0af052a262dcf3a28214c7c86442046fc5e50b698e838d1904395d7a5333b142'; \ ;; \ 's390x') \ - url='https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-s390x'; \ - sha256='356f87ca3e341f32e141994c1d3b62818d1245fb542360148cb52458b074b76c'; \ + url='https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-s390x'; \ + sha256='444af1a82eb51edd4a2aa5b1a209724f2acd19644e488fbd8c1dc8fd7d477f97'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 7402cbe4a..92784e901 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -65,9 +65,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.7.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 14b0f56d597539dd87e41e86047aaa350bbc6f1eccf98386aab77626bb3fd96b +ENV DOCKER_COMPOSE_VERSION 5.8.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0c2d9245a5f61e8e3cc85009b8b4888fa82fded08239d28bd6da5ca818eda2b2 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index 0dab4f240..e67a57f96 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -65,9 +65,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ docker buildx version; \ \ Write-Host 'Complete.'; -ENV DOCKER_COMPOSE_VERSION 5.7.2 -ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-windows-x86_64.exe -ENV DOCKER_COMPOSE_SHA256 14b0f56d597539dd87e41e86047aaa350bbc6f1eccf98386aab77626bb3fd96b +ENV DOCKER_COMPOSE_VERSION 5.8.0 +ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-windows-x86_64.exe +ENV DOCKER_COMPOSE_SHA256 0c2d9245a5f61e8e3cc85009b8b4888fa82fded08239d28bd6da5ca818eda2b2 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 53a5255a0..251ff1c57 100644 --- a/versions.json +++ b/versions.json @@ -128,61 +128,61 @@ "arches": { "amd64": { "file": "docker-compose-linux-x86_64", - "sha256": "e14235d9c622c5bd57eb8adeed4a0f7308c7f3862e6812dd843f6fe27f1307cc", - "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-x86_64" + "sha256": "b8840f5008c447f41fce0a57ae3adeab42c89b1eb6e6012524bcabbfb4ffbaf6", + "url": "https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-x86_64" }, "arm32v6": { "file": "docker-compose-linux-armv6", - "sha256": "fa75f7fbe0f3a52079a6c4a9de042b12f48ec3b3e7ba6cd17a580041c836d9cc", - "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-armv6" + "sha256": "c88658466ae9a4dadae64e6a4ec125202212bd460934537bd482bcd5e313f57b", + "url": "https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-armv6" }, "arm32v7": { "file": "docker-compose-linux-armv7", - "sha256": "1a6dae3953997851a54c9a89df03b443c0f40653c6f9c1c4944a94492145ace8", - "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-armv7" + "sha256": "a7a79755648b975b66df08b4bfbe12b29f113d5dd8c7cd5b6b53b69efff2f422", + "url": "https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-armv7" }, "arm64v8": { "file": "docker-compose-linux-aarch64", - "sha256": "e3afd91588e494ff309fced4ad40c5fa93ababe54c1c2eeffe90865719d8d0db", - "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-aarch64" + "sha256": "1a9c918b2fb49b9c87f0018c64b5abd0d30715155e98dc939779fbaee6c414d3", + "url": "https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-aarch64" }, "darwin-amd64": { "file": "docker-compose-darwin-x86_64", - "sha256": "0c50a809f7e60de9f32cafdc24074f20249f89d415fdd3823d3e011a770a796d", - "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-darwin-x86_64" + "sha256": "5c41cd573c549dc66abb03c5b29d6d4dfaae206b2e79848d1c32482bb2a3b416", + "url": "https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-darwin-x86_64" }, "darwin-arm64v8": { "file": "docker-compose-darwin-aarch64", - "sha256": "85b86e18da0d39cea41124773b432ef3d9ac64da068432c5f4170a25058bb74b", - "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-darwin-aarch64" + "sha256": "008b8fcf6c6d60340f5796626a0f0d51c042085793a9b1653343011727140b71", + "url": "https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-darwin-aarch64" }, "ppc64le": { "file": "docker-compose-linux-ppc64le", - "sha256": "c8b8789049235d0d76a7db1f18e888976dd780c65e09916a596b7a786b3c0a64", - "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-ppc64le" + "sha256": "921437ba1fe9b5f7e3146c74c4d6c56673881741561c71bc23106b1e45886b1d", + "url": "https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-ppc64le" }, "riscv64": { "file": "docker-compose-linux-riscv64", - "sha256": "4b1a69cb84018857ff3984aa848c3d67546a638e99b9ba96c48f7a5ecfa177b0", - "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-riscv64" + "sha256": "0af052a262dcf3a28214c7c86442046fc5e50b698e838d1904395d7a5333b142", + "url": "https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-riscv64" }, "s390x": { "file": "docker-compose-linux-s390x", - "sha256": "356f87ca3e341f32e141994c1d3b62818d1245fb542360148cb52458b074b76c", - "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-linux-s390x" + "sha256": "444af1a82eb51edd4a2aa5b1a209724f2acd19644e488fbd8c1dc8fd7d477f97", + "url": "https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-linux-s390x" }, "windows-amd64": { "file": "docker-compose-windows-x86_64.exe", - "sha256": "14b0f56d597539dd87e41e86047aaa350bbc6f1eccf98386aab77626bb3fd96b", - "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-windows-x86_64.exe" + "sha256": "0c2d9245a5f61e8e3cc85009b8b4888fa82fded08239d28bd6da5ca818eda2b2", + "url": "https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-windows-x86_64.exe" }, "windows-arm64v8": { "file": "docker-compose-windows-aarch64.exe", - "sha256": "46e393b4e4e26958fefca5999c73ed456b8111ecb8ed260074a27ff349b67a51", - "url": "https://github.com/docker/compose/releases/download/v5.7.2/docker-compose-windows-aarch64.exe" + "sha256": "ec7a100a77d9aedbaa6e2b13a10140729860b58b8d2b6855d8191c52e7dd50fc", + "url": "https://github.com/docker/compose/releases/download/v5.8.0/docker-compose-windows-aarch64.exe" } }, - "version": "5.7.2" + "version": "5.8.0" }, "dindCommit": "8d9e3502aba39127e4d12196dae16d306f76993d", "variants": [ From eae4490118181dba16df073a3ed8fb5911b09519 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Thu, 19 Nov 2026 20:04:12 -0800 Subject: [PATCH 667/667] Update 29 to buildx 0.39.1 --- 29/cli/Dockerfile | 30 ++--- .../windowsservercore-ltsc2022/Dockerfile | 6 +- .../windowsservercore-ltsc2025/Dockerfile | 6 +- versions.json | 104 +++++++++--------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/29/cli/Dockerfile b/29/cli/Dockerfile index 4eeb62afc..a4c408851 100644 --- a/29/cli/Dockerfile +++ b/29/cli/Dockerfile @@ -70,38 +70,38 @@ RUN set -eux; \ \ docker --version -ENV DOCKER_BUILDX_VERSION 0.39.0 +ENV DOCKER_BUILDX_VERSION 0.39.1 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-amd64'; \ - sha256='5fb31a097304fbf6dd4038649a0decf32c2b9510e4047acd7d68b9d700c46194'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-amd64'; \ + sha256='903090816da68f8bc1a2ff5346dd163a5adacfce4548d003c75df42cd47a9bf4'; \ ;; \ 'armhf') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v6'; \ - sha256='462b5699af263c05c5c1d973ab33f41810c263585d5b8b3dcfa6f7d3a11bc987'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-arm-v6'; \ + sha256='3675402568ec1a5b96792d6bde9ebdafb9d29e9681b7ff747e97d54c2198a735'; \ ;; \ 'armv7') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v7'; \ - sha256='a49d315f68f6ed91b2ea88da4259b418abe015be68460e0eebe0b8d9f74970b1'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-arm-v7'; \ + sha256='e6c51234507ef11ea661a8f714412a5eb9abeba586da73dca82ad89410f03b13'; \ ;; \ 'aarch64') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm64'; \ - sha256='722cdcdfdd6f3fb943fa1ba75102d057feb18ba72aab93b1b0a8cf2b2b48a25f'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-arm64'; \ + sha256='05c88e0f9152825e609a1cdb391faf14d5f94d23d071eaecb87bae69d98da8b8'; \ ;; \ 'ppc64le') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-ppc64le'; \ - sha256='dd7b1f65b7432229a619d3b92ddbdd742fb26fa8b4a281a99489431ef5e041b7'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-ppc64le'; \ + sha256='69713727c669ca87660c2197a5b97389cbad189120ee405f801986e8459ef83b'; \ ;; \ 'riscv64') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-riscv64'; \ - sha256='58d328fe5a8e58f4e5934913c1f7c51d6633f197d28f3114fe2cb9026cfb5d74'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-riscv64'; \ + sha256='b0af9b8cf5e8e244ea4049b4ca897c77a0b8b0d78c1b1cd7b8324d451de71ed8'; \ ;; \ 's390x') \ - url='https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-s390x'; \ - sha256='754f15a88f4496b5ddea3ac5626dd068f836965f799253a6402b07d324c45892'; \ + url='https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-s390x'; \ + sha256='f611aa33cd5290ad1e2ca6d5357a06123541643698d729392d05a20d527e526e'; \ ;; \ *) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \ esac; \ diff --git a/29/windows/windowsservercore-ltsc2022/Dockerfile b/29/windows/windowsservercore-ltsc2022/Dockerfile index 92784e901..40a3c6a8d 100644 --- a/29/windows/windowsservercore-ltsc2022/Dockerfile +++ b/29/windows/windowsservercore-ltsc2022/Dockerfile @@ -44,9 +44,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.39.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743 +ENV DOCKER_BUILDX_VERSION 0.39.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 4a665d2c71f6f87a42313cb8847b8e834e2dfb1626a1b57fcdbaacf41a6c8387 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/29/windows/windowsservercore-ltsc2025/Dockerfile b/29/windows/windowsservercore-ltsc2025/Dockerfile index e67a57f96..8ad30c73b 100644 --- a/29/windows/windowsservercore-ltsc2025/Dockerfile +++ b/29/windows/windowsservercore-ltsc2025/Dockerfile @@ -44,9 +44,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \ Write-Host 'Complete.'; # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414 -ENV DOCKER_BUILDX_VERSION 0.39.0 -ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe -ENV DOCKER_BUILDX_SHA256 b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743 +ENV DOCKER_BUILDX_VERSION 0.39.1 +ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.windows-amd64.exe +ENV DOCKER_BUILDX_SHA256 4a665d2c71f6f87a42313cb8847b8e834e2dfb1626a1b57fcdbaacf41a6c8387 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \ Write-Host ('Creating {0} ...' -f $dir); \ New-Item -ItemType Directory $dir -Force; \ diff --git a/versions.json b/versions.json index 251ff1c57..e97e8e7b1 100644 --- a/versions.json +++ b/versions.json @@ -37,92 +37,92 @@ "buildx": { "arches": { "amd64": { - "file": "buildx-v0.39.0.linux-amd64", - "sha256": "5fb31a097304fbf6dd4038649a0decf32c2b9510e4047acd7d68b9d700c46194", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-amd64" + "file": "buildx-v0.39.1.linux-amd64", + "sha256": "903090816da68f8bc1a2ff5346dd163a5adacfce4548d003c75df42cd47a9bf4", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-amd64" }, "arm32v6": { - "file": "buildx-v0.39.0.linux-arm-v6", - "sha256": "462b5699af263c05c5c1d973ab33f41810c263585d5b8b3dcfa6f7d3a11bc987", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v6" + "file": "buildx-v0.39.1.linux-arm-v6", + "sha256": "3675402568ec1a5b96792d6bde9ebdafb9d29e9681b7ff747e97d54c2198a735", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-arm-v6" }, "arm32v7": { - "file": "buildx-v0.39.0.linux-arm-v7", - "sha256": "a49d315f68f6ed91b2ea88da4259b418abe015be68460e0eebe0b8d9f74970b1", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm-v7" + "file": "buildx-v0.39.1.linux-arm-v7", + "sha256": "e6c51234507ef11ea661a8f714412a5eb9abeba586da73dca82ad89410f03b13", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-arm-v7" }, "arm64v8": { - "file": "buildx-v0.39.0.linux-arm64", - "sha256": "722cdcdfdd6f3fb943fa1ba75102d057feb18ba72aab93b1b0a8cf2b2b48a25f", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-arm64" + "file": "buildx-v0.39.1.linux-arm64", + "sha256": "05c88e0f9152825e609a1cdb391faf14d5f94d23d071eaecb87bae69d98da8b8", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-arm64" }, "darwin-amd64": { - "file": "buildx-v0.39.0.darwin-amd64", - "sha256": "dda7fe88c8ac15ebc4fd57c452ee3ba44336967c74221a0b229b6cff68bec538", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.darwin-amd64" + "file": "buildx-v0.39.1.darwin-amd64", + "sha256": "52f6c18ba57d1d103aaaecd9c38087af124909c83aa8aa66fd6f130fc6c0619d", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.darwin-amd64" }, "darwin-arm64v8": { - "file": "buildx-v0.39.0.darwin-arm64", - "sha256": "0190e4b9c85510974290f9a597e86c4d8200be782aeaa3df7d756ab4423d6b2d", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.darwin-arm64" + "file": "buildx-v0.39.1.darwin-arm64", + "sha256": "7a7f10602f0826d36b046e8db012b4cbfaa4ba56f9d2a5d374fe5bb7ae864fc4", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.darwin-arm64" }, "freebsd-amd64": { - "file": "buildx-v0.39.0.freebsd-amd64", - "sha256": "e9c558170bd90fa64624a2fb8be3fe49c19ff20179ff9ca90e158be1c0a5a1b1", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.freebsd-amd64" + "file": "buildx-v0.39.1.freebsd-amd64", + "sha256": "26d13a39bac3a67a223c2a96cb6a929eadecfac3e6daff150d0ce22bc767e38c", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.freebsd-amd64" }, "freebsd-arm64v8": { - "file": "buildx-v0.39.0.freebsd-arm64", - "sha256": "e675fd6288733fcba8e2fb83f5dea7b2eb6b9d5ed113a014c691ba53ba22a7da", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.freebsd-arm64" + "file": "buildx-v0.39.1.freebsd-arm64", + "sha256": "80136c0fc9200fbc460ecd236b76f4e647616012eb8770e5f57aaa95702a54d8", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.freebsd-arm64" }, "netbsd-amd64": { - "file": "buildx-v0.39.0.netbsd-amd64", - "sha256": "ff57e8f0e579310eecd83932711e70caba71e77032d3fd5c30c28b8879c5f6ff", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.netbsd-amd64" + "file": "buildx-v0.39.1.netbsd-amd64", + "sha256": "b2b5907e8b4c902dc9df95c85857f668463fca06088e56f49dcac0df9cb3362c", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.netbsd-amd64" }, "netbsd-arm64v8": { - "file": "buildx-v0.39.0.netbsd-arm64", - "sha256": "4a719008779ca3c8c9422efbca191ee12edfad33775b0c15d8cd4cd6a8b0a5b4", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.netbsd-arm64" + "file": "buildx-v0.39.1.netbsd-arm64", + "sha256": "97af1f8a64faf5834452025ebdc07302bc0b1961ff3552d2b4ae170f3b90d55b", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.netbsd-arm64" }, "openbsd-amd64": { - "file": "buildx-v0.39.0.openbsd-amd64", - "sha256": "02be7ee1aa2ec4925699197c23a85237f57ec4432e21d159744004ed5532566c", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.openbsd-amd64" + "file": "buildx-v0.39.1.openbsd-amd64", + "sha256": "378aa8d382ba764e8c2597afd6f742b9ca386c96c5a3d219e648ef67b466a894", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.openbsd-amd64" }, "openbsd-arm64v8": { - "file": "buildx-v0.39.0.openbsd-arm64", - "sha256": "cc049d24dd236e9ad5816fc8747958d35ea2a2dc5876650cfeb16a64879461d4", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.openbsd-arm64" + "file": "buildx-v0.39.1.openbsd-arm64", + "sha256": "fa4c1ed66f5f21843ab23778c34101a693436be7a39a08673ad896e4c7792b9e", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.openbsd-arm64" }, "ppc64le": { - "file": "buildx-v0.39.0.linux-ppc64le", - "sha256": "dd7b1f65b7432229a619d3b92ddbdd742fb26fa8b4a281a99489431ef5e041b7", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-ppc64le" + "file": "buildx-v0.39.1.linux-ppc64le", + "sha256": "69713727c669ca87660c2197a5b97389cbad189120ee405f801986e8459ef83b", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-ppc64le" }, "riscv64": { - "file": "buildx-v0.39.0.linux-riscv64", - "sha256": "58d328fe5a8e58f4e5934913c1f7c51d6633f197d28f3114fe2cb9026cfb5d74", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-riscv64" + "file": "buildx-v0.39.1.linux-riscv64", + "sha256": "b0af9b8cf5e8e244ea4049b4ca897c77a0b8b0d78c1b1cd7b8324d451de71ed8", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-riscv64" }, "s390x": { - "file": "buildx-v0.39.0.linux-s390x", - "sha256": "754f15a88f4496b5ddea3ac5626dd068f836965f799253a6402b07d324c45892", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.linux-s390x" + "file": "buildx-v0.39.1.linux-s390x", + "sha256": "f611aa33cd5290ad1e2ca6d5357a06123541643698d729392d05a20d527e526e", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.linux-s390x" }, "windows-amd64": { - "file": "buildx-v0.39.0.windows-amd64.exe", - "sha256": "b51a432f9013fe9b506e34df9eb4e3d2464350ddf792d579ce07f36cc57cb743", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-amd64.exe" + "file": "buildx-v0.39.1.windows-amd64.exe", + "sha256": "4a665d2c71f6f87a42313cb8847b8e834e2dfb1626a1b57fcdbaacf41a6c8387", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.windows-amd64.exe" }, "windows-arm64v8": { - "file": "buildx-v0.39.0.windows-arm64.exe", - "sha256": "95987aac9f3b9833e12ca7de963416d403e1e1dc7b7c974c165f2ecb1a587868", - "url": "https://github.com/docker/buildx/releases/download/v0.39.0/buildx-v0.39.0.windows-arm64.exe" + "file": "buildx-v0.39.1.windows-arm64.exe", + "sha256": "2edf4093a6eefc56c140a00b781c332e0654591e5952d7f13a8dd8353a9a57e1", + "url": "https://github.com/docker/buildx/releases/download/v0.39.1/buildx-v0.39.1.windows-arm64.exe" } }, - "version": "0.39.0" + "version": "0.39.1" }, "compose": { "arches": {